conduit 1.1 support
Merge pull request #11 from snoyberg/master

conduit 1.1 support