Merge pull request #134 from edvinasme/pillar-roots-format

Fix pillar_roots configuration format in master

salt/files/master.d/f_defaults.conf

 # Pillar is laid out in the same fashion as the file server, with environments,
 # a top file and sls files. However, pillar data does not need to be in the
 # highstate format, and is generally just key/value pairs.
-{% if 'pillar_roots' in cfg_master %}
+{% if 'pillar_roots' in cfg_master -%}
 pillar_roots:
-{% for name, roots in cfg_master['pillar_roots']|dictsort %}
+{%- for name, roots in cfg_master['pillar_roots']|dictsort %}
   {{ name }}:
-{% for dir in roots %}
+{%- for dir in roots %}
     - {{ dir }}
+{%- endfor -%}
 {% endfor %}
-{% endfor %}
-{% elif 'pillar_roots' in cfg_salt %}
+{%- elif 'pillar_roots' in cfg_salt -%}
 pillar_roots:
-{% for name, roots in cfg_salt['pillar_roots']|dictsort %}
+{%- for name, roots in cfg_salt['pillar_roots']|dictsort -%}
   {{ name }}:
-{% for dir in roots %}
+{%- for dir in roots -%}
     - {{ dir }}
-{% endfor %}
-{% endfor %}
-{% else %}
+{%- endfor -%}
+{%- endfor -%}
+{%- else -%}
 #pillar_roots:
 #  base:
 #    - /srv/pillar
-{% endif %}
+{%- endif %}
 #
 {% if 'ext_pillar' in cfg_master %}
 ext_pillar: