Merge branch 'edge' of github.com:imathis/octopress into edge

.themes/classic/source/_includes/navigation.html

@@ -12,5 +12,5 @@
 </form>
 <ul role="main-nav">
   <li><a href="/">Blog</a></li>
-  <li><a href="/archives.html">Archives</a></li>
+  <li><a href="/blog/archives.html">Archives</a></li>
 </ul>

.themes/classic/source/index.html

@@ -13,7 +13,7 @@ blog_index: true
   {% if paginator.next_page %}
     <a href="/page{{paginator.next_page}}/">&larr; Older</a>
   {% endif %}
-  <a href="/archive.html">Blog Archive</a>
+  <a href="/blog/archives.html">Blog Archive</a>
   {% if paginator.previous_page %}
     <a href="/page{{paginator.previous_page}}/">Newer &rarr;</a>
   {% endif %}