Cleaned up Haddock weirdness

Some of the Haddock docs weren't working. I cleaned that up. Added some missing function signatures. Also fixed a bug with GHC 7.4.1 and the dependencies.