Updates for GHC-7.8 and Conduit-1.0