Clean up and explicitify top-level imports.

All modified files are now also completely prettified via stylish-haskell.
Merge pull request #39 from HectorAE/master

Clean up and explicitify top-level imports.
Merge branch 'master' into monad-control

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