Derive Typeable for User (upcoming Yesod 1.2 change)
Merge branch 'postgres' into simple

Conflicts:
	Model.hs
	config/models