first commit
Merge https://github.com/jameswagner/pythonstuff