Bug fixes

Made sure package unzips and cleans up after itself.
Include 7Zip scripts and artifacts.
Merge pull request #1 from TrailHacker/master

Merge upstream