7 files changed, 21 insertions, 17 deletions
diff --git a/.themes/classic/source/_includes/article.html b/.themes/classic/source/_includes/article.html
index 6b3fb045..b561fbc7 100644
--- a/.themes/classic/source/_includes/article.html
+++ b/.themes/classic/source/_includes/article.html
@@ -12,9 +12,12 @@
 {% endunless %}
 {% if index %}
   <div class="entry-content">{{ content | excerpt }}</div>
-  <footer>
-    <a rel="full-article" href="{{ root_url }}{{ post.url }}">Read on &rarr;</a>
-  </footer>
+  {% capture excerpted %}{{ content | has_excerpt }}{% endcapture %}
+  {% if excerpted == 'true' %}
+    <footer>
+      <a rel="full-article" href="{{ root_url }}{{ post.url }}">{{ site.excerpt_link }}</a>
+    </footer>
+  {% endif %}
 {% else %}
 <div class="entry-content">{{ content }}</div>
 {% endif %}
diff --git a/.themes/classic/source/_includes/head.html b/.themes/classic/source/_includes/head.html
index 97f62de2..d6a6735b 100644
--- a/.themes/classic/source/_includes/head.html
+++ b/.themes/classic/source/_includes/head.html
@@ -25,8 +25,7 @@
   <script src="{{ root_url }}/javascripts/modernizr-2.0.js"></script>
   <script src="http://s3.amazonaws.com/ender-js/jeesh.min.js"></script>
   <script src="{{ root_url }}/javascripts/octopress.js" type="text/javascript"></script>
-  {% capture rss_url %}{% if site.subscribe_rss contains ':' %}{{ site.subscribe_rss }}{% else %}{{ root_url }}{{ site.subscribe_rss }}{% endif %}{% endcapture %}
-  <link href="{{ rss_url }}" rel="alternate" title="{{site.title}}" type="application/atom+xml"/>
+  <link href="{{ site.subscribe_rss }}" rel="alternate" title="{{site.title}}" type="application/atom+xml"/>
   {% include google_analytics.html %}
   {% include google_plus_one.html %}
   {% include twitter_sharing.html %}
diff --git a/.themes/classic/source/_includes/post/date.html b/.themes/classic/source/_includes/post/date.html
index f1ed4815..dce92472 100644
--- a/.themes/classic/source/_includes/post/date.html
+++ b/.themes/classic/source/_includes/post/date.html
@@ -6,5 +6,5 @@
 <time datetime="{{ date | datetime }}" pubdate {% if updated %} updated {% endif %}>{{ date | ordinalize }}</time>
 {% endif %}
 {% if was_updated != '0' %}
-<time class="updated" datetime="{{ updated | datetime }}"></time>
+<time class="updated" datetime="{{ updated | datetime }}">{{ updated | ordinalize }}</time>
 {% endif %}
diff --git a/.themes/classic/source/_layouts/page.html b/.themes/classic/source/_layouts/page.html
index 6710f8b1..08e056ec 100644
--- a/.themes/classic/source/_layouts/page.html
+++ b/.themes/classic/source/_layouts/page.html
@@ -4,10 +4,12 @@ layout: default
 
 <div>
 <article>
+  {% if page.title %}
   <header>
     <h1 class="entry-title">{{ page.title | titlecase }}</h1>
     {% if page.date %}<p class="meta">{% include post/date.html %}</p>{% endif %}
   </header>
+  {% endif %}
   {{ content }}
   {% unless page.footer == false %}
     <footer>
diff --git a/.themes/classic/source/atom.xml b/.themes/classic/source/atom.xml
index 23de64e9..693f3978 100644
--- a/.themes/classic/source/atom.xml
+++ b/.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>
diff --git a/.themes/classic/source/index.html b/.themes/classic/source/index.html
index 7f4c0e12..e7e96956 100644
--- a/.themes/classic/source/index.html
+++ b/.themes/classic/source/index.html
@@ -1,7 +1,7 @@
 ---
 layout: default
-footer: false
 ---
+
 <div class="blog-index">
 {% assign index = true %}
 {% for post in paginator.posts %}
@@ -13,13 +13,11 @@ footer: false
 <nav role="pagination">
   <div>
     {% if paginator.next_page %}
-      <a class="prev" href="/page{{paginator.next_page}}/">&larr; Older</a>
+      <a class="prev" href="{{paginator.next_page}}">&larr; Older</a>
     {% endif %}
     <a href="/blog/archives">Blog Archives</a>
-    {% if paginator.previous_page and paginator.previous_page > 1 %}
-      <a class="next" href="/page{{paginator.previous_page}}/">Newer &rarr;</a>
-    {% elsif paginator.previous_page %}
-      <a class="next" href="/">Newer &rarr;</a>
+    {% if paginator.previous_page %}
+    <a class="next" href="{{paginator.previous_page}}">Newer &rarr;</a>
     {% endif %}
   </div>
 </nav>
diff --git a/.themes/classic/source/javascripts/twitter.js b/.themes/classic/source/javascripts/twitter.js
index 676619e1..a4e85557 100644
--- a/.themes/classic/source/javascripts/twitter.js
+++ b/.themes/classic/source/javascripts/twitter.js
@@ -1,13 +1,15 @@
 // JSON-P Twitter fetcher for Octopress
 // (c) Brandon Mathis // MIT Lisence
 function getTwitterFeed(user, count, replies) {
-  feed = new jXHR();
+  var feed = new jXHR();
+
   feed.onerror = function (msg,url) {
     $('#tweets li.loading').addClass('error').text("Twitter's busted");
   }
   feed.onreadystatechange = function(data){
     if (feed.readyState === 4) {
       var tweets = new Array();
+      var i = 0;
       for (i in data){
         if(tweets.length < count){
           if(replies || data[i].in_reply_to_user_id == null){
@@ -66,7 +68,7 @@ function prettyDate(time) {
   var diff = ((current_date_full - date.getTime()) / 1000);
   var day_diff = Math.floor(diff / 86400);
 
-  if (isNaN(day_diff) || day_diff < 0 || day_diff >= 31) return;
+  if (isNaN(day_diff) || day_diff < 0) return "<span>&infin;</span>";
 
   return day_diff == 0 && (
     diff < 60 && say.just_now ||
@@ -76,5 +78,5 @@ function prettyDate(time) {
     diff < 86400 && Math.floor(diff / 3600) + say.hours_ago) ||
     day_diff == 1 && say.yesterday ||
     day_diff < 7 && day_diff + say.days_ago ||
-    day_diff < 31 && Math.ceil(day_diff / 7) + say.weeks_ago;
+    day_diff > 7 && Math.ceil(day_diff / 7) + say.weeks_ago;
 }