Fix haddock module links
Update build-depends versions
Merge branch 'master' of github.com:DanielG/monad-journal into DanielG-master

Conflicts:
	Control/Monad/Trans/Journal.hs
	monad-journal.cabal

Note: patched up.
Merge branch 'DanielG-master'