Merge "Clean up ZipFile a little, fix a few bugs, and improve the documentation."