Merge branch '2.0' of github.com:mongodb/node-mongodb-native into 2.0

Author: christkv

package.json

@@ -28,7 +28,7 @@
     , "mongodb-tools": "~1.0"
   },
   "author": "Christian Kvalheim",
-  "license": "Apache 2.0",
+  "license": "Apache-2.0",
   "bugs": {
     "url": "https://github.com/mongodb/node-mongodb-native/issues"
   },