Updating dependencies to work with conduit >= 1.1

Issuing a pull request with changes from another guy. Also added trivial changes from me.