Fixed typhoeus compatibility. Cleaned gemfile. Made tests green.

Merged #83 pull requests, fixed some merge conflicts.
Also fixed some broken typhoeus proxy tests and cleaned gemfile.