Conflicts: requests/api.py requests/exceptions.py requests/models.py
I ran the pep8 checker (version 0.6.1) on the code base and tried to clean up as many pep8 errors as I could. Everything except line-width errors are gone (I was worried about messing up the documentor since I haven't fiddled with it).