Adds Makefile
Fixes flakes after flake8 upgrade