Updating MGC in master
Pulling from 21.6 all the changes that have been made.
Updating to use flake8.
Apologies to @ssnyder if this requires work for Python3 -- if you have a little pointer to what I should do to test with Python3, I'm happy to do so and make the required changes.