Update to use conduit >= 1.1
Merge pull request #18 from ocharles/master

Update to use conduit >= 1.1