Merge pull request #730 from chrisglass/pep8ing-phase-one