autopep8 runthrough and janitorial changes.
Season to taste.
Merge branches 'kgaughan-pep8' and 'master'