Merge pull request #17 from KennethWilke/master

Added module_config section to minion template

pillar.example

@@ -10,3 +10,12 @@ salt:
         - /srv/salt
   minion:
     master: salt
+    module_config:
+      test: True
+      test.foo: foo
+      test.bar: 
+        - baz
+        - quo
+      test.baz:
+        spam: sausage
+        cheese: bread

salt/files/minion

@@ -509,7 +509,11 @@ pillar_roots:
 #
 # A dict for the test module:
 #test.baz: {spam: sausage, cheese: bread}
-
+{%- if 'module_config' in minion %}
+{%- for modkey, modval in minion.module_config.items() %}
+{{ modkey }}: {{ modval }}
+{%- endfor %}
+{%- endif %}
 
 ######      Update settings          ######
 ###########################################