GH #262 - Initial batch of updates.
Merge branch 'dsuch-t-gh262-flake8'
Merge branch 'master' into dsuch-t-gh258-add-simple-scheduler