Updating to be in line with Guzzle 3.6.0
Fixing tests
Merge pull request #1 from mtdowling/guzzle-update

Updating to be in line with Guzzle 3.6.0