Taking out the one measly pep8 violations together with changes to setup.py