Merge branch 'master' into bulk_api

# Conflicts:
#	CHANGELOG.md

Author: zookzook

CHANGELOG.md

@@ -5,6 +5,9 @@
    * Added support for connecting via UNIX sockets (`:socket` and `:socket_dir`)
    * Added support for bulk writes (ordered/unordered, in-memory/stream)
    * Added support for `op_msg` with payload type 1 
+   * Merged code from https://github.com/ankhers/mongodb/commit/63c20ff7e427744a5df915751adfaf6e5e39ae62
+   * Merged changes from https://github.com/ankhers/mongodb/pull/283
+   * Merged changes from https://github.com/ankhers/mongodb/pull/281
 
 ## v0.5.3