updating master conf
Merge branch 'master' of github.com:fxdgear/salt-talk