fixes to compile with current (1.9.2.2) http-conduit
Merge pull request #1 from dbp/master

Fix compile errors with current http-conduit (1.9.2.2)