some tidying but still not sure what jason broke
Merge branch 'master' of github.com:drvinceknight/ShortMM1Q
Some pep8 and fixing formula for wait