restructuring
Merge branch 'master' of https://github.com/maximusfowler/python-longscripts