Merge pull request #102 from myii/bug/fix-map-for-salt-ssh

fix(`map.jinja`): use pillar/config `.get` according to `__cli` option

Author: alxwr

template/map.jinja

@@ -21,4 +21,4 @@
 ) %}
 
 {#- Merge the template config (e.g. from pillar) #}
-{%- set template = salt['config.get']('template', default=defaults, merge=True) %}
+{%- set template = salt['config.get']('template', default=defaults) %}