Fix some warnings
Merge branch 'postgres' into mongo

Conflicts:
	tests/TestImport.hs