Upgrade to Jekyll 2.5

Author: michaelklishin

Gemfile

@@ -1,7 +1,6 @@
 source "https://rubygems.org"
 
-gem "jekyll", "~> 2.0.0.rc1"
-gem "redcarpet"
+gem "jekyll", "~> 2.5.2"
 # with Ruby 2.0 on OS X, you may need to install
 # it manually with --with-iconv-dir:
 #

Gemfile.lock

@@ -2,62 +2,65 @@ GEM
   remote: https://rubygems.org/
   specs:
     blankslate (2.1.2.4)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    celluloid-io (0.15.0)
-      celluloid (>= 0.15.0)
-      nio4r (>= 0.5.0)
-    classifier (1.3.4)
-      fast-stemmer (>= 1.0.0)
-    coffee-script (2.2.0)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    classifier-reborn (2.0.2)
+      fast-stemmer (~> 1.0)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.0)
+    coffee-script-source (1.8.0)
     colorator (0.1)
-    execjs (2.0.2)
+    execjs (2.2.2)
     fast-stemmer (1.0.2)
-    ffi (1.9.3)
+    ffi (1.9.6)
+    hitimes (1.2.2)
     iconv (1.0.4)
-    jekyll (2.0.0.rc1)
-      classifier (~> 1.3)
+    jekyll (2.5.2)
+      classifier-reborn (~> 2.0)
       colorator (~> 0.1)
       jekyll-coffeescript (~> 1.0)
-      jekyll-sass-converter (~> 1.0.0.rc3)
-      liquid (~> 2.5.5)
-      listen (~> 2.5)
-      maruku (= 0.7.0)
-      mercenary (~> 0.3.1)
-      pygments.rb (~> 0.5.0)
+      jekyll-gist (~> 1.0)
+      jekyll-paginate (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.1)
+      kramdown (~> 1.3)
+      liquid (~> 2.6.1)
+      mercenary (~> 0.3.3)
+      pygments.rb (~> 0.6.0)
       redcarpet (~> 3.1)
       safe_yaml (~> 1.0)
       toml (~> 0.1.0)
-    jekyll-coffeescript (1.0.0)
+    jekyll-coffeescript (1.0.1)
       coffee-script (~> 2.2)
-    jekyll-sass-converter (1.0.0.rc4)
+    jekyll-gist (1.1.0)
+    jekyll-paginate (1.1.0)
+    jekyll-sass-converter (1.2.1)
       sass (~> 3.2)
-    liquid (2.5.5)
-    listen (2.7.4)
+    jekyll-watch (1.1.2)
+      listen (~> 2.7)
+    kramdown (1.5.0)
+    liquid (2.6.1)
+    listen (2.8.3)
       celluloid (>= 0.15.2)
-      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    maruku (0.7.0)
-    mercenary (0.3.2)
-    nio4r (1.0.0)
+    mercenary (0.3.5)
     parslet (1.5.0)
       blankslate (~> 2.0)
-    posix-spawn (0.3.8)
-    pygments.rb (0.5.4)
+    posix-spawn (0.3.9)
+    pygments.rb (0.6.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.4)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    redcarpet (3.1.1)
-    safe_yaml (1.0.3)
-    sass (3.3.7)
-    timers (1.1.0)
-    toml (0.1.1)
+    redcarpet (3.2.1)
+    safe_yaml (1.0.4)
+    sass (3.4.9)
+    timers (4.0.1)
+      hitimes
+    toml (0.1.2)
       parslet (~> 1.5.0)
     yajl-ruby (1.1.0)
 
@@ -66,5 +69,4 @@ PLATFORMS
 
 DEPENDENCIES
   iconv
-  jekyll (~> 2.0.0.rc1)
-  redcarpet
+  jekyll (~> 2.5.2)