Upload updates

Build on the upgrade_to branch, which is still unmerged as well.
file -> zipfile (file is a builtin in 2.7)