conduit 1.1 support
Fix tests
Merge pull request #12 from snoyberg/master

conduit 1.1 support