Moved heavyweight stuff out to a .py (for now)
Merge branch 'master' of https://github.com/andrewclegg/snake-charmer
Temp workaround for https://github.com/saltstack/salt/issues/16210
Merge branch 'master' of https://github.com/andrewclegg/snake-charmer