woot.
Merge branch 'master' of github.com:reflexsystems/emongo

Conflicts:
	Makefile