Update to flake8 version 2.1

We had a few errors with the latest version of flake8. I fixed them, and updated the version in the requirements.
I also changed a few variables names conflicting with imports in `circusctl.py`, even if they weren't spotted by flake8.