7.0 pep8

Forgot commit d007be5
Fix additional style issues
Use official travis