Fix PEP8 based on the latest version of flake8

This will make Travis green again and will stop interfering on other pull requests