conduit 1.1
Merge pull request #97 from snoyberg/master

conduit 1.1