Update to faraday 0.9
resolve merge conflict
Merge pull request #20 from sqrrrl/master

Update to Faraday 0.9