Fix some type signatures
Merge branch 'master' into ver1.9

Conflicts:
	Network/HTTP/Conduit.hs
	Network/HTTP/Conduit/Request.hs
	http-conduit.cabal
Monoid now keeps recent cookies over older ones.