Fix PEP8, and forgotten import change. Update .travis.