3 files changed, 11 insertions, 3 deletions
diff --git a/.themes/classic/source/_includes/head.html b/.themes/classic/source/_includes/head.html
index d04d0d09..e7663eaf 100644
--- a/.themes/classic/source/_includes/head.html
+++ b/.themes/classic/source/_includes/head.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!--[if IEMobile 7 ]><html class="no-js iem7" manifest="default.appcache?v=1"><![endif]-->
+<!--[if IEMobile 7 ]><html class="no-js iem7"><![endif]-->
 <!--[if lt IE 9]><html class="no-js lte-ie8"><![endif]-->
 <!--[if (gt IE 8)|(gt IEMobile 7)|!(IEMobile)|!(IE)]><!--><html class="no-js" lang="en"><!--<![endif]-->
 <head>
@@ -19,6 +19,7 @@
     <meta name="keywords" content="{{page.keywords}}"/>
   {% endif %}
 
+  <link rel="canonical" href="{{ site.url }}{{ page.url }}"/>
   <link href="{{ root_url }}/favicon.png" rel="shortcut icon" />
   <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>
@@ -26,7 +27,8 @@
   <script src="{{ root_url }}/javascripts/octopress.js" type="text/javascript"></script>
   <link href='http://fonts.googleapis.com/css?family=PT+Serif:regular,italic,bold,bolditalic' rel='stylesheet' type='text/css'>
   <link href='http://fonts.googleapis.com/css?family=PT+Sans:regular,italic,bold,bolditalic' rel='stylesheet' type='text/css'>
-  <link href="{{ root_url }}/atom.xml" rel="alternate" title="{{site.title}}" type="application/atom+xml"/>
+  {% 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"/>
   {% include google_analytics.html %}
   {% include google_plus_one.html %}
   {% include twitter_sharing.html %}
diff --git a/.themes/classic/source/_includes/post/author.html b/.themes/classic/source/_includes/post/author.html
index b2db9043..83dd6a89 100644
--- a/.themes/classic/source/_includes/post/author.html
+++ b/.themes/classic/source/_includes/post/author.html
@@ -1,5 +1,7 @@
 {% if post.author %}
   {% assign author = post.author %}
+{% elsif page.author %}
+  {% assign author = page.author %}
 {% else %}
   {% assign author = site.author %}
 {% endif %}
diff --git a/.themes/classic/source/_layouts/page.html b/.themes/classic/source/_layouts/page.html
index a2fc41ed..34cb3430 100644
--- a/.themes/classic/source/_layouts/page.html
+++ b/.themes/classic/source/_layouts/page.html
@@ -11,7 +11,11 @@ layout: default
   {{ content }}
   {% unless page.footer == false %}
     <footer>
-      {% if page.date %}<p class="meta">{% include post/date.html %}</p>{% endif %}
+      {% if page.date or page.author %}<p class="meta">
+        {% if page.author %}{% include post/author.html %}{% endif %}
+        {% include post/date.html %}
+        {% if page.categories %}{% include post/categories.html %}{% endif %}
+      </p>{% endif %}
       {% unless page.sharing == false %}
         {% include post/sharing.html %}
       {% endunless %}