From 1f8377f1573a99010dcf232da9eb2aea725fa829 Mon Sep 17 00:00:00 2001
From: Brandon Mathis <brandon@imathis.com>
Date: Fri, 8 Jun 2012 14:29:08 -0500
Subject: [PATCH] Merge from 2.1

---
 .themes/classic/source/_includes/head.html | 2 +-
 _config.yml                                | 2 +-
 plugins/pullquote.rb                       | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.themes/classic/source/_includes/head.html b/.themes/classic/source/_includes/head.html
index 9482d18..2ed44e4 100644
--- a/.themes/classic/source/_includes/head.html
+++ b/.themes/classic/source/_includes/head.html
@@ -17,7 +17,7 @@
   <meta name="MobileOptimized" content="320">
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
-  {% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
+  {% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' }}{% endif %}{% endcapture %}
   <link rel="canonical" href="{{ canonical }}">
   <link href="{{ root_url }}/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css">
   <script src="{{ root_url }}/javascripts/modernizr-2.0.js"></script>
diff --git a/_config.yml b/_config.yml
index 0ff8048..ac5159d 100644
--- a/_config.yml
+++ b/_config.yml
@@ -66,7 +66,7 @@ blog_index_asides: [asides/twitter.html, asides/delicious.html, asides/pinboard.
 #   3rd Party Settings    #
 # ----------------------- #
 
-# Javascript social buttons often generate lots of http requests and may track viewers browsing history
+# Javascript social buttons often generate lots of http requests and may track your viewer's browsing history
 # Show respect for privacy and bandwidth with simple links for Twitter, Facebook and Google Plus.
 respectfully_social: true
 
diff --git a/plugins/pullquote.rb b/plugins/pullquote.rb
index f6ecf57..3c65e66 100644
--- a/plugins/pullquote.rb
+++ b/plugins/pullquote.rb
@@ -33,9 +33,7 @@ module Jekyll
     def render(context)
       output = super
       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.gsub(/\{"\s*|\s*"\}/, '')}</span>"
       else
         return "Surround your pullquote like this {\" text to be quoted \"}"