Merge branch 'master' of https://github.com/leetcher/mongo-syntax

Conflicts:
	mongo/mongo_sqlite3.py

	modified:   mongo/mongo_nuodb.py
Merge branch 'master' of https://github.com/leetcher/mongo-syntax