adding setup.cfg to give hints to flake8
Merge remote branch 'origin/master'