Merge branch 'postgres' into simple

Conflicts:
	PROJECTNAME.cabal
	tests/TestImport.hs
Revert "Merge branch 'postgres' into simple"

This reverts commit e5fa45aeb7a6e66b0e9e184558099e41b77ea339, reversing
changes made to 454258143ab0e660d53c7888185d303e3e8b0dc5.
Merge remote-tracking branch 'upstream/simple' into simple