actualized master config to 2014.1.3
actualized minion config to 2014.1.3
Merge branch 'actual-config'