cleanup
Merge https://github.com/nlapinski/PyZ