Revert to latest salt bootstrap and force SSL
Merge pull request #932 from derekwaynecarr/issue_923

Revert to latest salt bootstrap and force SSL