random fixes

salt/manager/init.sls

 include:
+  - manager.pipeline
   - manager.gitrepo
   - manager.agentgit
   - manager.postgres
@@ -6,7 +7,6 @@ include:
   - manager.virtualenv
   - manager.configuration
   - manager.nginx
-  - manager.pipeline
 
 manager:
   pkg.installed:
@@ -36,7 +36,7 @@ manager:
   service:
     - running
     - watch:
-      - file: postactivate
+      - file: manager_postactivate
       - file: /etc/init/manager.conf
       - file: /etc/init/mancelery.conf
       - file: /etc/init/moncelery.conf

salt/nfs-client/init.sls

+{% if pillar['nfs']['enabled'] %}
 nfs-client:
   pkg.installed:
     - pkgs:
@@ -14,3 +15,4 @@ nfs-client:
     - pass_num: 2
     - persist: True
     - mkmnt: True
+{% endif %}

salt/storagedriver/nfs-server.sls

+{% if pillar['nfs']['enabled'] %}
 nfs-server:
   service:
    - name: nfs-kernel-server
@@ -13,3 +14,6 @@ nfs-server:
     - template: jinja
     - sources:
       - salt://storagedriver/files/exports.tmpl
+    - require:
+      - pkg: nfs-server
+{% endif %}