Merge pull request #16 from bechtoldt/improvements

setting the remaining changes caused by the change to module.wait

apache/fcgid.sls

   cmd.run:
     - order: 225
     - unless: ls /etc/apache2/mods-enabled/fcgid.load
-    - require: 
+    - require:
       - pkg: mod-fcgid
     - watch_in:
-      - cmd: apache-restart
+      - module: apache-restart
 
 {% endif %}

apache/php5.sls

     - require:
       - pkg: mod-php5
     - watch_in:
-      - cmd: apache-restart
+      - module: apache-restart
 
 {% if 'apache' in pillar and 'php-ini' in pillar['apache'] %}
 /etc/php5/apache2/php.ini:
     - source: {{ pillar['apache']['php-ini'] }}
     - order: 225
     - watch_in:
-      - cmd: apache-restart
+      - module: apache-restart
     - require:
       - pkg: apache
       - pkg: php5

apache/rewrite.sls

     - require:
       - pkg: apache
     - watch_in:
-      - cmd: apache-restart
+      - module: apache-restart
 
 {% endif %}

apache/vhost_alias.sls

     - require:
       - pkg: apache
     - watch_in:
-      - cmd: apache-restart
+      - module: apache-restart
 
 {% endif %}

apache/vhosts/standard.sls

     - require:
       - file: {{ id }}
     - watch_in:
-      - cmd: apache-reload
+      - module: apache-reload
 {% endif %}
 
 {% endfor %}