Changes for GHC 7.4.2

It's still not all working, I have two problems now that I'm not sure how to resolve.  Will discuss in #haskell-llvm.