Switch from MonadCatchIO-transformers to monad-control
This is for compatibility with the upcoming version of snap
Fix bugs in SpliceAPI
Merge branch 'master' into monad-control

Conflicts:
	heist.cabal
	src/Heist/SpliceAPI.hs
Bump to 1.0
Add stylish-haskell config file
Merge branch 'master' into monad-control

Conflicts:
	src/Heist/Common.hs
	src/Heist/Types.hs