Deal with this requests bug: https://github.com/kennethreitz/requests/issues/660

(Which has been now since fixed, but I'll tweak so that I don't force a requests upgrade on folks)