Merge pull request #32 from dmjio/master

Bumped http-conduit upper bound