PEP8
Merge branch 'nagle' of github.com:kevinburke/urllib3 into nagle