Merge pull request google#8 from amorris13/master

Upstream changes to archive patcher:

Last version before major modifications to clean up in preparation fo…

…r v1.0, which will be significantly different in structure and capability now that the research phase is over.