Upgrade urllib3 to 1.9.x
Fix test bug courtesy of @shazow
Merge pull request #2142 from sigmavirus24/urllib3-1.9

Upgrade urllib3 to 1.9.x