pep8 spacing and import cleanup

i tried to limit this to just whitespace changes and alphabetizing/grouping imports according to pep8

`flake8 --max-line-length=250 .` still shows a lot to do, but I think this is already a big set of changes and I already hit a merge conflict once.