Some PEP8 fixes and Travis update