Wrap to 79 colums. No functionality change.
Merge pull request #682 from nico/pep8

Wrap to 79 colums. No functionality change.