Upgrade to Jekyll 2.

Gemfile

@@ -5,8 +5,8 @@ gem 'rake'
 gem 'jekyll'
 gem 'jekyll-assets'
 
-gem 'octopress', '~> 3.0.0.rc.8'
-gem 'octopress-deploy', '~> 1.0.0.rc.6'
+gem 'octopress', '~> 3.0.0.rc.10'
+gem 'octopress-deploy', '~> 1.0.0.rc.8'
 
 gem 'kramdown', '~> 1.3.3'
 

Gemfile.lock

@@ -5,47 +5,56 @@ GEM
     bourbon (4.0.1)
       sass (~> 3.3)
       thor
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
     classifier (1.3.4)
       fast-stemmer (>= 1.0.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.7.0)
     colorator (0.1)
-    commander (4.1.6)
-      highline (~> 1.6.11)
     execjs (2.0.2)
     facets (2.9.3)
     fast-stemmer (1.0.2)
     ffi (1.9.3)
-    highline (1.6.21)
     hike (1.2.3)
-    jekyll (1.5.1)
+    jekyll (2.0.3)
       classifier (~> 1.3)
       colorator (~> 0.1)
-      commander (~> 4.1.3)
+      jekyll-coffeescript (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      kramdown (~> 1.3)
       liquid (~> 2.5.5)
-      listen (~> 1.3)
-      maruku (= 0.7.0)
+      listen (~> 2.5)
+      mercenary (~> 0.3.3)
       pygments.rb (~> 0.5.0)
-      redcarpet (~> 2.3.0)
+      redcarpet (~> 3.1)
       safe_yaml (~> 1.0)
       toml (~> 0.1.0)
-    jekyll-assets (0.7.7)
-      jekyll (~> 1.0)
+    jekyll-assets (0.7.8)
+      jekyll (>= 1.0.0, < 3.0.0)
+      sass
       sprockets (~> 2.10)
+    jekyll-coffeescript (1.0.0)
+      coffee-script (~> 2.2)
+    jekyll-sass-converter (1.0.0)
+      sass (~> 3.2)
     json (1.8.1)
     kramdown (1.3.3)
     liquid (2.5.5)
-    listen (1.3.1)
+    listen (2.7.5)
+      celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    maruku (0.7.0)
-    mercenary (0.3.2)
-    multi_json (1.9.3)
-    octopress (3.0.0.rc.8)
-      jekyll (~> 1.5, >= 1.5.0)
+    mercenary (0.3.3)
+    multi_json (1.10.0)
+    octopress (3.0.0.rc.10)
+      jekyll (~> 2.0, >= 2.0.0)
       mercenary (~> 0.3.2)
-    octopress-deploy (1.0.0.rc.7)
+    octopress-deploy (1.0.0.rc.8)
       colorator
-      octopress (~> 3.0.0.rc.1)
+      octopress (~> 3.0.0.rc.10)
     parslet (1.5.0)
       blankslate (~> 2.0)
     posix-spawn (0.3.8)
@@ -53,13 +62,11 @@ GEM
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rack (1.5.2)
-    rake (10.3.1)
+    rake (10.3.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.4)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.2)
-      ffi (>= 0.5.0)
-    redcarpet (2.3.0)
+    redcarpet (3.1.2)
     safe_yaml (1.0.3)
     sass (3.3.7)
     sprockets (2.12.1)
@@ -69,6 +76,7 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     thor (0.19.1)
     tilt (1.4.1)
+    timers (1.1.0)
     toml (0.1.1)
       parslet (~> 1.5.0)
     uglifier (2.5.0)
@@ -85,8 +93,8 @@ DEPENDENCIES
   jekyll
   jekyll-assets
   kramdown (~> 1.3.3)
-  octopress (~> 3.0.0.rc.8)
-  octopress-deploy (~> 1.0.0.rc.6)
+  octopress (~> 3.0.0.rc.10)
+  octopress-deploy (~> 1.0.0.rc.8)
   rake
   sass
   uglifier

_config.yml

@@ -2,7 +2,7 @@ url: http://danbarber.me
 title: Dan Barber
 author: Dan Barber
 markdown: kramdown
-pygments: true
+highlighter: pygments
 
 simple_search: https://duckduckgo.com/