Fix stricter flake8 errors from travis