Refactor bootstrap script. Test on scratch VMs and make necessary adjustments.
Missed an underscore
Merge pull request #29 from gsarjeant/enhance_bootstrap

Enhance bootstrap