Minor style cleanup.

Removed some of the auto-cabal comments from the .cabal file, removed trailing whitespace and lowered the dependency bound so I could play with it in 7.4 and look at it without my editor showing all sorts of flags about trailing whitespace. ;)