Switch to TypeLits for GHC-7.8
Update for Conduit-1.0
Merge pull request #1 from em225125/master

Updates for GHC-7.8 and Conduit-1.0