update master and minion configs from Salt source
Merge pull request #5 from lewispeckover/master

update master and minion configs from Salt source