Remove unneeded import
Merge branch 'postgres' into simple

Conflicts:
	Model.hs
WAI version bumps
Merge branch 'postgres' into simple