Merge pull request #25 from z-saltstack/master

Actualized master and minion config files templates