Merge pull request #21 from Projoke/patch-1

modify saltmaster_bootstrap