Merge pull request #959 from agorf/master

Stuff is double-escaped in meta pages (config, sitemap)

middleman-core/lib/middleman-core/meta_pages/config_setting.rb

@@ -15,11 +15,11 @@ module Middleman
         key_classes << 'modified' if @setting.value_set?
         content << content_tag(:span, @setting.key.inspect, :class => key_classes.join(' '))
         content << " = "
-        content << content_tag(:span, CGI::escapeHTML(@setting.value.inspect), :class => 'value')
+        content << content_tag(:span, @setting.value.inspect, :class => 'value')
         if @setting.default
           content << content_tag(:span, :class => 'default') do
             if @setting.value_set?
-              "Default: #{CGI::escapeHTML(@setting.default.inspect)}"
+              "Default: #{@setting.default.inspect}"
             else
               "(Default)"
             end

middleman-core/lib/middleman-core/meta_pages/sitemap_resource.rb

@@ -23,10 +23,10 @@ module Middleman
                 row_content = ""
                 row_content << content_tag(:th, label)
                 row_content << content_tag(:td, value)
-                row_content
+                row_content.html_safe
               end
             end
-            content
+            content.html_safe
           end
         end
       end