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

* Copied the development version of the bootstrap script while there's no stable release.