Update dependencies
Merge branch 'master' of http://darcs.haskell.org/git-mirrors/Cabal/
Merge GHC fork into upstream