Zip file for 2.0 release, and other minor cleanup