Merge branch 'NEW-MASTER' into Greg-Sauce
python clean up
huh
Merge branch 'Greg-Sauce' into NEW-MASTER