Merge pull request #20 from spsoit/master

Context parameter safety fixes

nginx/ng/config.sls

@@ -11,4 +11,4 @@ nginx_config:
     - source: salt://nginx/ng/files/nginx.conf
     - template: jinja
     - context:
-      config: {{ nginx.server.config }}
+        config: {{ nginx.server.config|json() }}

nginx/ng/vhosts_config.sls

@@ -93,7 +93,7 @@ nginx_vhost_available_dir:
     - source: salt://nginx/ng/files/vhost.conf
     - template: jinja
     - context:
-      config: {{ settings.config }}
+        config: {{ settings.config|json() }}
 {% do vhost_states.append(conf_state_id) %}
 {% endif %}