Some PEP8 white-space cleanup
Simplified tox.ini