moved from central
Merge branch 'master' of github.com:thruttle/salt-pillar