Pull in changes from production bootstrap script
Merge pull request #365 from reddmetrics/feature/update-bootstrap

update forma_bootstrap.sh with changes from production script