Fixed merge conflict and rearaged readme.

README.rst

@@ -25,6 +25,11 @@ Install a minion
 
 Install a master.
 
+``salt.syndic``
+---------------
+
+Install a syndic.
+
 ``salt.cloud``
 ---------------
 

salt/package-map.jinja

@@ -1,28 +1,36 @@
 {% set package_table = {
     'Debian': {'salt-master': 'salt-master',
                'salt-minion': 'salt-minion',
+               'salt-syndic': 'salt-syndic',
                'salt-cloud': 'salt-cloud'},
     'Ubuntu': {'salt-master': 'salt-master',
                'salt-minion': 'salt-minion',
+               'salt-syndic': 'salt-syndic',
                'salt-cloud': 'salt-cloud'},
     'CentOS': {'salt-master': 'salt-master',
                'salt-minion': 'salt-minion',
+               'salt-syndic': 'salt-syndic',
                'salt-cloud': 'salt-cloud'},
     'Amazon': {'salt-master': 'salt-master',
                'salt-minion': 'salt-minion',
+               'salt-syndic': 'salt-syndic',
                'salt-cloud': 'salt-cloud'},
     'Fedora': {'salt-master': 'salt-master',
                'salt-minion': 'salt-minion',
+               'salt-syndic': 'salt-syndic',
                'salt-cloud': 'salt-cloud'},
     'RedHat': {'salt-master': 'salt-master',
                'salt-minion': 'salt-minion',
+               'salt-syndic': 'salt-syndic',
                'salt-cloud': 'salt-cloud'},
     'Gentoo': {'salt-master': 'app-admin/salt',
                'salt-minion': 'app-admin/salt',
-               'salt-minion': 'app-admin/salt'},
+               'salt-syndic': 'app-admin/salt',
+               'salt-cloud': 'app-admin/salt'},
     'Arch':   {'salt-master': 'salt',
                'salt-minion':  'salt',
-               'salt-minion':  'salt'}
+               'salt-syndic':  'salt',
+               'salt-cloud':  'salt'}
 } %}
 
 {% if 'package_table' in pillar %}

salt/syndic.sls

@@ -0,0 +1,15 @@
+{% from "salt/package-map.jinja" import pkgs with context %}
+
+include:
+  - salt.master
+
+salt-syndic:
+  pkg.installed:
+    - name: {{ pkgs['salt-syndic'] }}
+  service:
+    - running
+    - require:
+      - service: salt-master
+    - watch:
+      - pkg: salt-master
+      - file: /etc/salt/master