more mostly-whitespace pep8 fixes
Merge pull request #5521 from UtahDave/develop

Add missing imports for Windows
Merge pull request #5520 from hulu/pep8-more

more mostly-whitespace pep8 fixes
log only after logging is set up