Merge pull request #33 from raizyr/upstream

log_granular_levels pillar data looks at the wrong thing

salt/files/master

@@ -728,7 +728,7 @@ peer_run:
 #
 {% if 'log_granular_levels' in master %}
 log_granular_levels:
-  {% for name, lvl in salt['log_granular_levels'] %}
+  {% for name, lvl in master['log_granular_levels'] %}
   {{ name }}: {{ lvl }}
   {% endfor -%}
 {% elif 'log_granular_levels' in salt %}