merge master -D org -I include -E exclude: PR 91 (Run scc and tests through flake8)