Merge pull request #199 from kevinschmidt/master

add consul config support to master config file

salt/files/master.d/f_defaults.conf

@@ -1045,3 +1045,12 @@ rest_tornado:
 ##########################################
 {{ get_config('presence_events', 'False') }}
 {% endif %}
+
+{% if 'consul_config' in cfg_master %}
+#####         consul_config          #####
+##########################################
+consul_config:
+  {% for name, value in cfg_master['consul_config'].items() %}
+  {{ name }}: {{ value }}
+  {%- endfor %}
+{%- endif %}