Merge pull request #477 from noelmcloughlin/fx

fix(minion): fix requisites from recent prs

salt/master.sls

     - enable: {{ salt_settings.master_service_details.enabled }}
     - name: {{ salt_settings.master_service }}
     - watch:
+           {%- if grains.kernel|lower == 'darwin' %}
       - file: salt-master-macos
+           {%- else %}
       - file: salt-master
+           {%- endif %}
       - file: remove-old-master-conf-file
     {% endif %}
     {% if salt_settings.master_remove_config %}

salt/minion.sls

         interval: 10
         splay: 10
     - require_in:
+      - service: salt-minion
+    - watch_in:
       - service: salt-minion
         {%- endif %}
     {%- endif %}
     - enable: {{ salt_settings.minion_service_details.enabled }}
     - name: {{ salt_settings.minion_service }}
     - watch:
-      - file: salt-master-macos
-      - file: salt-master
       - file: remove-old-minion-conf-file
     {% endif %}
     {%- if not salt_settings.restart_via_at %}