Reintroduce the upgrade to requests 2.0.0

Should be good to go now that we don't need httpretty
in the CLI tests.
Merge branch 'requests-2.0.0' into develop

* requests-2.0.0:
  Reintroduce the upgrade to requests 2.0.0