Merge pull request #378 from mrichar1/extra_config

Handle other non-iterable values like int/float.

salt/files/minion.d/f_defaults.conf

@@ -1255,13 +1255,13 @@ alternative.mongo.{{ name }}: {{ value }}
 
 {%- for configname in cfg_minion %}
 {%- if configname not in reserved_keys and configname not in default_keys %}
-  {%- if cfg_minion[configname] is string %}
-{{ configname }}: {{ cfg_minion[configname]|json }}
-  {%- elif cfg_minion[configname] is iterable %}
+  {%- if cfg_minion[configname] is iterable and cfg_minion[configname] is not string %}
 {{ configname }}:
     {%- for item in cfg_minion[configname] %}
   - {{ item }}
     {%- endfor -%}
+  {%- else %}
+{{ configname }}: {{ cfg_minion[configname]|json }}
   {%- endif %}
 {%- endif %}
 {%- endfor %}