Merge pull request #12 from 23Skidoo/unbreak-ghc-7.4