Updating mongojs version.
resolved conflicts
Merge remote-tracking branch 'upstream/dev/0.1' into dev/0.1

Conflicts:
	package.json