Church29 pep8editing

Merges master into pep8editing and corrects the newly created pep8 errors.