Fixing imports
Merge branch 'master' of github.com:Fristi/scotty into Fristi-master

Fix Control.Exception import for GHC 7.4