7.0 pep8

Forgot commit d007be5
Fix additional style issues
Use official travis
Because it will cause an exception when init (not update) is run twice, which travis tests do.
I don't like leaving any code that can spontaneously crash.