diff --git a/source/404.markdown b/source/404.markdown
new file mode 100644
index 0000000..1d69211
--- /dev/null
+++ b/source/404.markdown
@@ -0,0 +1,8 @@
+---
+layout: page
+title: Page Not Found
+---
+
+Oops, I couldn’t find that page! Sorry about that.
+
+Maybe try the search box (top right), or look through the [archives](/archives)?
diff --git a/source/_includes/disqus.html b/source/_includes/disqus.html
index eb30877..3321666 100644
--- a/source/_includes/disqus.html
+++ b/source/_includes/disqus.html
@@ -2,6 +2,7 @@
 {% if site.disqus_short_name and page.comments != false %}
 <script type="text/javascript">
       var disqus_shortname = '{{ site.disqus_short_name }}';
+			var disqus_developer = '{{ site.disqus_developer }}';
       {% if page.comments == true %}
         {% comment %} `page.comments` can be only be set to true on pages/posts, so we embed the comments here. {% endcomment %}
         // var disqus_developer = 1;
diff --git a/source/_layouts/post.html b/source/_layouts/post.html
index 41b7475..2db2dc2 100644
--- a/source/_layouts/post.html
+++ b/source/_layouts/post.html
@@ -5,7 +5,7 @@ single: true
 
 <div>
 {% include post/variables.html %}
-<article class="hentry" role="article" {% if linklog %}class="linklog"{% endif %}>
+<article class="hentry {% if linklog %}linklog{% endif %}" role="article">
   {% include article.html %}
   <footer>
     <p class="meta">
diff --git a/source/blog/archives/index.html b/source/archives/index.html
similarity index 100%
rename from source/blog/archives/index.html
rename to source/archives/index.html
diff --git a/source/docs/blogging/index.markdown b/source/docs/blogging/index.markdown
index 407d9b6..beb9e67 100644
--- a/source/docs/blogging/index.markdown
+++ b/source/docs/blogging/index.markdown
@@ -43,12 +43,13 @@ which tells Jekyll how to processes posts and pages.
     title: "Zombie Ninjas Attack: A survivor's retrospective"
     date: 2011-07-03 5:59
     comments: true
+    external-url:
     categories:
     ---
 ```
 
 Here you can turn comments off and or categories to your post. If you are working on a multi-author blog, you can add `author: Your Name` to the
-metadata for proper attribution on a post. If you are working on a draft, you can add `published: false` to prevent it from being posted when you generate your blog.
+metadata for proper attribution on a post. If you are working on a draft, you can add `published: false` to prevent it from being posted when you generate your blog. If you want to publish a [linklog](/docs/blogging/linklog) style post (blog entries point to external urls), simply add an external-url to your post.
 
 You can add a single category or multiple categories like this.
 
diff --git a/source/docs/configuring/index.markdown b/source/docs/configuring/index.markdown
index 92604eb..626c25d 100644
--- a/source/docs/configuring/index.markdown
+++ b/source/docs/configuring/index.markdown
@@ -34,8 +34,10 @@ In the `_config.yml` there are three sections for configuring your Octopress Blo
     author:             # Your name, for RSS, Copyright, Metadata
     simple_search:      # Search engine for simple site search
     description:        # A default meta description for your site
+    date_format:        # Format dates using Ruby's date strftime syntax
     subscribe_rss:      # Url for your blog's feed, defauts to /atom.xml
     subscribe_email:    # Url to subscribe by email (service required)
+    category_feeds:     # Enable per category RSS feeds (defaults to false in 2.1)
     email:              # Email address for the RSS feed if you want it.
 ```
 
@@ -73,12 +75,14 @@ If you want to publish your site to a subdirectory, [(see Deploying Octopress to
 <h3 id="third_party">3rd Party Settings</h3>
 These third party integrations are already set up for you. Simply fill in the configurations and they'll be added to your site.
 
+- **Github** - *List your github repositories in the sidebar*
 - **Twitter** - *Setup a sidebar twitter feed, follow button, and tweet button (for sharing posts and pages).*
 - **Google Plus One** - *Setup sharing for posts and pages on Google's plus one network.*
 - **Pinboard** - *Share your recent Pinboard bookmarks in the sidebar.*
 - **Delicious** - *Share your recent Delicious bookmarks in the sidebar.*
 - **Disqus Comments** - *Add your disqus short name to enable disqus comments on your site.*
 - **Google Analytics** - *Add your tracking id to enable Google Analytics tracking for your site.*
+- **Facebook** - *Add a Facebook like button*
 
 The Octopress layouts read these configurations and only include the javascript and html necessary for the enabled services.
 
diff --git a/source/docs/plugins/gist-tag/index.markdown b/source/docs/plugins/gist-tag/index.markdown
index fceac15..0567f07 100644
--- a/source/docs/plugins/gist-tag/index.markdown
+++ b/source/docs/plugins/gist-tag/index.markdown
@@ -24,4 +24,4 @@ If you have a gist with multiple files, you can include files one at a time by a
     {{ "{% gist 1059334 svg_bullets.rb" }} %}
     {{ "{% gist 1059334 usage.scss" }} %}
 
-This plugin was developed by [Brandon Tilly](http://brandontilley.com/2011/01/31/gist-tag-for-jekyll.html) but I have fixed some bugs and made some improvements to it for Octopress.
+This plugin was initially developed by [Brandon Tilly](http://brandontilley.com/2011/01/31/gist-tag-for-jekyll.html) for Jekyll blogs.
diff --git a/source/index.html b/source/index.html
index d826b41..d201912 100644
--- a/source/index.html
+++ b/source/index.html
@@ -13,7 +13,7 @@ layout: default
     {% if paginator.next_page %}
       <a class="prev" href="{{paginator.next_page}}">&larr; Older</a>
     {% endif %}
-    <a href="/blog/archives">Blog Archives</a>
+    <a href="/archives">Blog Archives</a>
     {% if paginator.previous_page %}
     <a class="next" href="{{paginator.previous_page}}">Newer &rarr;</a>
     {% endif %}