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

Conflicts:
	PROJECTNAME.cabal