updating for newer versions of salt
Merge branch 'master' of github.com:cloudseed-project/cloudseed-formulas