merge origin/master

templates/mixins/disqus.jade

@@ -3,7 +3,7 @@ mixin disqus
     script(type="text/javascript").
       var disqus_shortname = 'brettlangdon';
       var disqus_identifier = 'http://brett.is#{page.url}';
-      var disqus_title = '#{page.title}';
+      var disqus_title = '#{page.title.replace("\'", "")}';
       var disqus_url = "http://brett.is#{page.url}";
       (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;