pep8

No code was modified, only formatting as required by the python pep8 standard.

This makes code much easier to merge.