Tests pass this time.
update urllib3 to current master with ssl bugfixes
Merge pull request #1128 from mvid/master

Updating urllib3 to current master
Merge pull request #1127 from sigmavirus24/fix1126

A simple fix