default master and minion
move salt and pillar out of srv
gitfs sucks