Consolidate the syndic
Consolidate the syndic

The syndic was setting up a number of minion constructs that it does
not need, this commit strips them out and simplifies the syndic

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt