Merge branch 'prefer-.flake8' into 'master'

Prefer `.flake8` if present for options.

If somebody explicitly has a `.flake8` file, presumably they intend to put flake8 configuration in it, so prefer it to the generic `setup.cfg` and `tox.ini` from pycodestyle.


See merge request !63