Fix ambiguous catch for GHC 7.4
Merge pull request #35 from snoyberg/master

Fix ambiguous catch for GHC 7.4