diff --git a/404.md b/404.md
index fe2decb..8c84a38 100644
--- a/404.md
+++ b/404.md
@@ -2,6 +2,7 @@
 layout: page
 title: "Page Not Found"
 description: "Page not found. Your pixels are in another canvas."
+sitemap: false
 ---  
 
 Sorry, but the page you were trying to view does not exist --- perhaps you can try searching for it below.
diff --git a/Gemfile b/Gemfile
index a35588d..b61810a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,12 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'jekyll'
-gem 'kramdown'
-gem 'coderay'
-gem 'rake'
-gem 'thor'
-gem 'activesupport'
-gem 'stringex'
+gem 'jekyll-sitemap'
 
 group :test do
   gem 'html-proofer'
diff --git a/_config.yml b/_config.yml
index e6e192f..0b4bd88 100644
--- a/_config.yml
+++ b/_config.yml
@@ -43,13 +43,13 @@ links:
     url: http://mademistakes.com
     external: true
 
-# http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-timezone:    America/New_York
 future:      true
-pygments:    true
-#highlighter: pygments
+highlighter: pygments
 markdown:    kramdown
 
+gems:
+  - jekyll-sitemap
+
 # https://github.com/mojombo/jekyll/wiki/Permalinks
 permalink:   /:categories/:title/
 
@@ -68,4 +68,4 @@ kramdown:
     coderay_css: class
 
 include: [".htaccess"]
-exclude: ["lib", "config.rb", "Gemfile", "Capfile", "README.md", "LICENSE", "Gemfile.lock", "config", "log", "Rakefile", "Rakefile.rb", "tmp", "less", "*.sublime-project", "*.sublime-workspace", "test", "spec", "Gruntfile.js", "package.json", "node_modules", "vendor"]
+exclude: ["lib", "config.rb", "Gemfile", "Capfile", "README.md", "LICENSE", "Gemfile.lock", "config", "log", "Rakefile", "Rakefile.rb", "tmp", "less", "*.sublime-project", "*.sublime-workspace", "test", "spec", "Gruntfile.js", "package.json", "node_modules", "vendor"]
\ No newline at end of file
diff --git a/sitemap.xml b/sitemap.xml
deleted file mode 100644
index 604cb0d..0000000
--- a/sitemap.xml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-layout: nil
----
-<?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-    <url>
-        <loc>{{ site.url }}</loc>
-    </url>
-    
-    {% for page in site.pages %}
-    <url>
-        <loc>{{ site.url }}{{ page.url }}</loc>
-    </url>
-    {% endfor %}
-
-    {% for post in site.posts %}
-    <url>
-        <loc>{{ site.url }}{{ post.url }}</loc>
-    </url>
-    {% endfor %}
-</urlset>
\ No newline at end of file