conduit 1.2
Merge pull request #16 from snoyberg/master

conduit 1.2