various pep-8 cleanups; remove unsused imports; remove unused variables
Update with style considerations by @kennethreitz
Merge pull request #2088 from jeffknupp/master

various pep-8 cleanups; remove unsused imports; remove unused variables