Merge branch 'master' into site

.gitignore

@@ -5,6 +5,8 @@ _gist_cache
 _code_cache
 _deploy
 public
+sass.old
+source.old
 source/_stash
 source/stylesheets/screen.css
 vendor

.themes/classic/sass/base/_typography.scss

@@ -107,7 +107,7 @@ blockquote {
   cite {
     font-style: italic;
     a { color: $text-color-light !important; word-wrap: break-word; }
-    &:before { content: '–'; padding:{right: .3em; left: .3em;} color: $text-color-light; }
+    &:before { content: '\2014'; padding:{right: .3em; left: .3em;} color: $text-color-light; }
   }
   @media only screen and (min-width: 992px) {
     padding-left: 1.5em;

.themes/classic/source/_includes/custom/header.html

@@ -0,0 +1,6 @@
+<hgroup>
+  <h1><a href="{{ root_url }}/">{{ site.title }}</a></h1>
+  {% if site.subtitle %}
+    <h2>{{ site.subtitle }}</h2>
+  {% endif %}
+</hgroup>

.themes/classic/source/_includes/header.html

@@ -1,6 +1 @@
-<hgroup>
-  <h1><a href="{{ root_url }}/">{{ site.title }}</a></h1>
-  {% if site.subtitle %}
-    <h2>{{ site.subtitle }}</h2>
-  {% endif %}
-</hgroup>
+{% include custom/header.html %}

.themes/classic/source/atom.xml

@@ -4,7 +4,7 @@ layout: nil
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
 
-  <title>{{ site.blog_title }}</title>
+  <title>{{ site.title }}</title>
   <link href="{{ site.url }}/atom.xml" rel="self"/>
   <link href="{{ site.url }}/"/>
   <updated>{{ site.time | date_to_xmlschema }}</updated>
@@ -22,7 +22,7 @@ layout: nil
     <link href="{{ site.url }}{{ post.url }}"/>
     <updated>{{ post.date | date_to_xmlschema }}</updated>
     <id>{{ site.url }}{{ post.id }}</id>
-    <content type="html">{{ post.content | full_urls: site.url | xml_escape }}</content>
+    <content type="html">{{ post.content | expand_urls: site.url | xml_escape }}</content>
   </entry>
   {% endfor %}
 </feed>

_config.yml

@@ -29,7 +29,7 @@ code_dir: downloads/code
 category_dir: blog/categories
 category_title_prefix: "Category: "
 markdown: rdiscount
-pygments: false
+pygments: false # default python pygments have been replaced by pygments.rb
 
 paginate: 10 # Posts per page on the blog index
 recent_posts: 5 # Posts in the sidebar Recent Posts section