conduit 1.2
Merge pull request #2 from snoyberg/master

conduit 1.2