Merge branch 'release/v2.4.0'

Author: TheSeg

Gemfile.lock

@@ -9,80 +9,99 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     blankslate (2.1.2.4)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
     classifier (1.3.4)
       fast-stemmer (>= 1.0.0)
+    coffee-script (2.3.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.7.1)
     colorator (0.1)
-    commander (4.1.6)
-      highline (~> 1.6.11)
+    execjs (2.2.1)
     fast-stemmer (1.0.2)
     ffi (1.9.3)
-    gemoji (1.5.0)
-    github-pages (20)
+    gemoji (2.0.0)
+    github-pages (21)
       RedCloth (= 4.2.9)
-      jekyll (= 1.5.1)
-      jekyll-mentions (= 0.0.9)
-      jekyll-redirect-from (= 0.3.1)
-      jekyll-sitemap (= 0.3.0)
-      jemoji (= 0.1.0)
+      jekyll (= 2.2.0)
+      jekyll-coffeescript (= 1.0.0)
+      jekyll-mentions (= 0.1.3)
+      jekyll-redirect-from (= 0.4.0)
+      jekyll-sass-converter (= 1.1.0)
+      jekyll-sitemap (= 0.5.0)
+      jemoji (= 0.3.0)
       kramdown (= 1.3.1)
-      liquid (= 2.5.5)
+      liquid (= 2.6.1)
       maruku (= 0.7.0)
+      pygments.rb (= 0.6.0)
       rdiscount (= 2.1.7)
-      redcarpet (= 2.3.0)
-    highline (1.6.21)
-    html-pipeline (1.5.0)
+      redcarpet (= 3.1.2)
+    html-pipeline (1.9.0)
       activesupport (>= 2)
       nokogiri (~> 1.4)
     i18n (0.6.11)
-    jekyll (1.5.1)
+    jekyll (2.2.0)
       classifier (~> 1.3)
       colorator (~> 0.1)
-      commander (~> 4.1.3)
-      liquid (~> 2.5.5)
-      listen (~> 1.3)
-      maruku (= 0.7.0)
-      pygments.rb (~> 0.5.0)
-      redcarpet (~> 2.3.0)
+      jekyll-coffeescript (~> 1.0)
+      jekyll-gist (~> 1.0)
+      jekyll-paginate (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.0)
+      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-mentions (0.0.9)
-      html-pipeline (~> 1.5.0)
-      jekyll (~> 1.4)
-    jekyll-redirect-from (0.3.1)
-      jekyll (~> 1.4)
-    jekyll-sitemap (0.3.0)
-      jekyll (~> 1.4)
-    jemoji (0.1.0)
-      gemoji (~> 1.5.0)
-      html-pipeline (~> 1.5.0)
-      jekyll (~> 1.4)
+    jekyll-coffeescript (1.0.0)
+      coffee-script (~> 2.2)
+    jekyll-gist (1.1.0)
+    jekyll-mentions (0.1.3)
+      html-pipeline (~> 1.9.0)
+      jekyll (~> 2.0)
+    jekyll-paginate (1.0.0)
+    jekyll-redirect-from (0.4.0)
+      jekyll (~> 2.0)
+    jekyll-sass-converter (1.1.0)
+      sass (~> 3.2)
+    jekyll-sitemap (0.5.0)
+    jekyll-watch (1.0.0)
+      listen (~> 2.7)
+    jemoji (0.3.0)
+      gemoji (~> 2.0)
+      html-pipeline (~> 1.9)
+      jekyll (~> 2.0)
     json (1.8.1)
     kramdown (1.3.1)
-    liquid (2.5.5)
-    listen (1.3.1)
+    liquid (2.6.1)
+    listen (2.7.9)
+      celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
     maruku (0.7.0)
+    mercenary (0.3.4)
     mini_portile (0.6.0)
     minitest (5.4.0)
     nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
     parslet (1.5.0)
       blankslate (~> 2.0)
     posix-spawn (0.3.8)
-    pygments.rb (0.5.4)
+    pygments.rb (0.6.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.3)
-      ffi (>= 0.5.0)
     rdiscount (2.1.7)
-    redcarpet (2.3.0)
+    redcarpet (3.1.2)
     safe_yaml (1.0.3)
+    sass (3.3.13)
     thread_safe (0.3.4)
+    timers (1.1.0)
     toml (0.1.1)
       parslet (~> 1.5.0)
     tzinfo (1.2.1)

_config.yml

@@ -1,7 +1,7 @@
 lsi: false
 markdown:  redcarpet
 permalink: pretty
-pygments:  true
+highlighter:  true
 timezone: America/Los_Angeles
 gems:
   - jekyll-redirect-from