Changed cabal file for hackage
Merged in Greg Weber's changes