SHEP8
Merge branch 'master' of github.com:rupa/p
Add pystrap