more PEP-8 fixes
update travis config
Merge pull request #2 from gurneyalex/6.1

more PEP-8 fixes