Merge "Add autopep8 to tox.ini"