Undo the cpp tricks to hide Prelude.catch; just do a qualified import instead.
Merge pull request #1 from benarmston/wrap-runghc

Wrap runghc
Merge pull request #2 from benarmston/include-missing-source-files-hsenv-cabal

Include missing source files hsenv cabal
Fix GHC 7.4 compatibility (Prelude.catch issue)
Merge with tip of tmhedberg/master.