Include argparse in bundle installer (py26 fix)

This also cleans up parts of the bundled installer:

* Fix bug when error occurs (previously not printing the error message properly because stderr was `None`)
* There was an unimplemented zip_dir function that was called but didn't do anything.  I've also implemented this so that `scripts/make-bundle` will produce a zip file.