Update code to work with the bootstrap script to keep temporary files. Fixes #680.

* Copied the development version of the bootstrap script while there's no stable release.
Merge pull request #682 from s0undt3ch/develop

Update code to work with the bootstrap script to keep temporary files