recode, reorder & big cleanup
Merge branch 'master' of https://github.com/benleb/PyGlow