conduit 1.1
Merge pull request #1 from snoyberg/master

conduit 1.1 compatibility