Fix simple pep8 stuff to test full merge.

Merged username-removed-263547 requested to merge tgmaxson/ase:master into master

Testing how gitlab flow works.