Merge branches 'client-monad' and 'pipes' into pu

Conflicts:
	mpd.cabal