Merge pull request #3 from salt-formulas/new-bootstrap

Merge salt-master-setup/init.sh -> bootstrap.sh