Merge "Fix some pep8 errors, update tox.ini"