Don't delete zips during clean; Cleaned up py code a bit
Merge branch 'release-2.0-nightly' into release-2.0