Fix some cabal files
Merge branch 'master' of github.com:yesodweb/wai