Merge branch 'develop'

.gitignore

@@ -2,4 +2,5 @@ build
 *.pyc
 .DS_Store
 nohup.out
-build_config.mk
+build_config.mk
+var/

bootstrap.sh

@@ -11,7 +11,7 @@ go get github.com/szferi/gomdb
 
 go get github.com/boltdb/bolt
 
-go get gopkg.in/mgo.v2/bson
 go get github.com/ugorji/go/codec
 go get github.com/BurntSushi/toml
 
+go get github.com/siddontang/go-bson/bson

server/client_http.go

@@ -10,8 +10,8 @@ import (
 	"strings"
 
 	"encoding/json"
+	"github.com/siddontang/go-bson/bson"
 	"github.com/ugorji/go/codec"
-	"gopkg.in/mgo.v2/bson"
 )
 
 var allowedContentTypes = map[string]struct{}{