update salt conf
Merge branch 'master' of github.com:apieceofredcloth/config