Update to attempt to use 0.8 or 0.9 Faraday.

These changes should work with either the 0.8 or 0.9 Faraday releases.