diff --git a/_config.yml b/_config.yml
index 86f3fb97..8035041d 100644
--- a/_config.yml
+++ b/_config.yml
@@ -150,6 +150,7 @@ gems:
   - jekyll-paginate
   - jekyll-sitemap
   - jekyll-gist
+  - jekyll-feed
 
 # Outputting
 permalink: /:categories/:title/
diff --git a/_data/authors.yml b/_data/authors.yml
index 108118c4..0ea8a64a 100644
--- a/_data/authors.yml
+++ b/_data/authors.yml
@@ -1,15 +1,15 @@
 # Authors
 
-billy_rick:
+Billy Rick:
   name        : "Billy Rick"
-  web         : "http://thewhip.com"
+  uri         : "http://thewhip.com"
   email       : "billy@rick.com"
   bio         : "What do you want, jewels? I am a very extravagant man."
   avatar      : "bio-photo-2.jpg"
   twitter     : "extravagantman"
   google_plus : "BillyRick"
 
-cornelius_fiddlebone:
+Cornelius Fiddlebone:
   name        : "Cornelius Fiddlebone"
   email       : "cornelius@thewhip.com"
   bio         : "I ordered what?"
diff --git a/_includes/author-profile.html b/_includes/author-profile.html
index 4c9cff8a..29458ce7 100644
--- a/_includes/author-profile.html
+++ b/_includes/author-profile.html
@@ -12,6 +12,9 @@
 
   <h3 class="author-name">{{ author.name }}</h3>
   {% if author.bio %}<p class="author-bio">{{ author.bio }}</p>{% endif %}
+  {% if author.uri %}
+    <a href="{{ author.uri }}" class="author-social" target="_blank"><i class="fa fa-fw fa-globe"></i>Website</a>
+  {% endif %}
   {% if author.email %}
     <a href="mailto:{{ author.email }}" class="author-social" target="_blank"><i class="fa fa-fw fa-envelope-square"></i> Email</a>
   {% endif %}
diff --git a/_posts/2012-03-15-template-author-override.md b/_posts/2012-03-15-template-author-override.md
index 00ce9b66..db20af45 100644
--- a/_posts/2012-03-15-template-author-override.md
+++ b/_posts/2012-03-15-template-author-override.md
@@ -1,6 +1,6 @@
 ---
 title: "Template: Author Override"
-author: billy_rick
+author: Billy Rick
 excerpt: "A post to test author overrides using a data file."
 ---
 For those of you who may have content written by multiple authors on your site you can now assign different authors to each post if desired.
@@ -12,15 +12,15 @@ Start by modifying or creating a new `authors.yml` file in the `_data` folder an
 {% highlight yaml %}
 # /_data/authors.yml
 
-billy_rick:
+Billy Rick:
   name: Billy Rick
-  web: http://thewhip.com
+  uri: http://thewhip.com
   email: billy@rick.com
   bio: "What do you want, jewels? I am a very extravagant man."
   avatar: bio-photo-2.jpg
   twitter: extravagantman
 
-cornelius_fiddlebone:
+Cornelius Fiddlebone:
   name: Cornelius Fiddlebone
   email: cornelius@thewhip.com
   bio: "I ordered what?"
@@ -31,5 +31,5 @@ cornelius_fiddlebone:
 To assign Billy Rick as an author for our post. You'd add the following YAML front matter to a post:
 
 {% highlight yaml %}
-author: billy_rick
+author: Billy Rick
 {% endhighlight %}
diff --git a/feed.xml b/feed.xml
deleted file mode 100644
index 1ebf68f2..00000000
--- a/feed.xml
+++ /dev/null
@@ -1,43 +0,0 @@
----
-sitemap: false
----
-
-<?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en">
-<title type="text">{{ site.title }}</title>
-<generator uri="https://github.com/jekyll/jekyll">Jekyll</generator>
-<link rel="self" type="application/atom+xml" href="{{ site.url }}/feed.xml" />
-<link rel="alternate" type="text/html" href="{{ site.url }}" />
-<updated>{{ site.time | date_to_xmlschema }}</updated>
-<id>{{ site.url }}/</id>
-<author>
-  <name>{{ site.owner.name }}</name>
-  <uri>{{ site.url }}/</uri>
-  {% if site.owner.email %}<email>{{ site.owner.email }}</email>{% endif %}
-</author>
-{% for post in site.posts limit:20 %}
-{% if post.author %}
-  {% assign author = site.data.authors[post.author] %}
-{% else %}
-  {% assign author = site.owner %}
-{% endif %}
-<entry>
-  <title type="html"><![CDATA[{{ post.title | cdata_escape }}]]></title>
-  <link rel="alternate" type="text/html" href="{{ site.url }}{{ post.url }}" />
-  <id>{{ site.url }}{{ post.id }}</id>
-  {% if post.modified %}<updated>{{ post.modified | to_xmlschema }}T00:00:00-00:00</updated>
-  <published>{{ post.date | date_to_xmlschema }}</published>
-  {% else %}<published>{{ post.date | date_to_xmlschema }}</published>
-  <updated>{{ post.date | date_to_xmlschema }}</updated>{% endif %}
-  <author>
-    <name>{{ author.name }}</name>
-    <uri>{{ site.url }}</uri>
-    {% if author.email %}<email>{{ author.email }}</email>{% endif %}
-  </author>
-  <content type="html">
-    {{ post.content | xml_escape }}
-    {% include feed-footer.html %}
-  </content>
-</entry>
-{% endfor %}
-</feed>