Merge branch '2.1' into site-2.1

plugins/pullquote.rb

@@ -32,11 +32,11 @@ module Jekyll
 
     def render(context)
       output = super
-      if output.join =~ /\{"\s*(.+?)\s*"\}/m
+      if output =~ /\{"\s*(.+?)\s*"\}/m
         #@quote = $1
         @quote = RubyPants.new($1).to_html
         #@quote = CGI.escape($1)
-        "<span class='pullquote-#{@align}' data-pullquote='#{@quote}'>#{output.join.gsub(/\{"\s*|\s*"\}/, '')}</span>"
+        "<span class='pullquote-#{@align}' data-pullquote='#{@quote}'>#{output.gsub(/\{"\s*|\s*"\}/, '')}</span>"
       else
         return "Surround your pullquote like this {\" text to be quoted \"}"
       end

plugins/puts.rb

@@ -23,8 +23,14 @@ module Jekyll
     end
 
     def render(context)
-      puts ">>> {% puts %} <<<"
-      puts super.map(&:strip).join
+      # Use a block if label + output is wider than 80 characters
+      if super.length > 69
+        puts "{% puts %}"
+        puts super
+        puts "{% endputs %}"
+      else
+        puts "{% puts %} #{super}"
+      end
     end
   end
 end