Reverts indentation to 2 spaces.
NFC: Adds more pep8 tweaks.

More column 80 fixes.
Spaces around + operator.
Two blank lines between functions.
Blank lines containing whitespace.
Multiple imports on one line.