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

Conflicts:
	carma-sync.cabal