Bump for GHC 7.8
Bump transformers
Merge branch 'master' into ghc-7.8

Conflicts:
	postgresql-sync-map.cabal