[FIX] Style changes

Just a pull request to merge the fixes for some PEP8 issues that avoid the correct Travis CI building.