Faraday 0.9 compatibility

CI will unfortunately intermittently fail (it did so prior to this PR) so I'll just merge this in spite of that when I get some review.

Changes aimed to stabilize our CI situation are coming in a separate PR.

Fixes #386

/cc @jfelchner @sferik @jjb