Integrate @stevechan changes + updating composer dependancy for Guzzle

Thanks for the lib, here's a little update to keep it usable with composer, and merge forks.