Version bump
Merge branch 'master' of github.com:snoyberg/conduit
Version bump