Allow conduit 1.2 versions
Merge pull request #5 from rcallahan/master

Allow conduit 1.2 versions