autopep8

Reduce remaining pep8 complaints by a factor of 2 by applying some
conservative autopep8:

    autopep8 -a -a -i -r
-select=E225,E231,E251,E261,E301,E302,E303,E304,E309,W291,W293,W391
contrib migration

Didn't like the way the tool does reindentation, so didn't use that.
more pep8
make pep8 test more strict