Merge branch 'release/2.6.1'

Author: TheSeg

.ruby-version

@@ -1 +1 @@
-ruby-2.1.1
+ruby-2.1

Gemfile.lock

@@ -2,41 +2,41 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    activesupport (4.1.8)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     blankslate (2.1.2.4)
     celluloid (0.16.0)
       timers (~> 4.0.0)
-    classifier-reborn (2.0.2)
+    classifier-reborn (2.0.3)
       fast-stemmer (~> 1.0)
     coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.8.0)
+    coffee-script-source (1.9.1)
     colorator (0.1)
-    execjs (2.2.2)
+    execjs (2.3.0)
     fast-stemmer (1.0.2)
     ffi (1.9.6)
     gemoji (2.1.0)
-    github-pages (29)
+    github-pages (33)
       RedCloth (= 4.2.9)
-      github-pages-health-check (~> 0.1)
+      github-pages-health-check (~> 0.2)
       jekyll (= 2.4.0)
-      jekyll-coffeescript (= 1.0.0)
-      jekyll-mentions (= 0.1.3)
+      jekyll-coffeescript (= 1.0.1)
+      jekyll-mentions (= 0.2.1)
       jekyll-redirect-from (= 0.6.2)
       jekyll-sass-converter (= 1.2.0)
-      jekyll-sitemap (= 0.6.0)
-      jemoji (= 0.3.0)
-      kramdown (= 1.3.1)
+      jekyll-sitemap (= 0.6.3)
+      jemoji (= 0.4.0)
+      kramdown (= 1.5.0)
       liquid (= 2.6.1)
       maruku (= 0.7.0)
       mercenary (~> 0.3)
-      pygments.rb (= 0.6.0)
+      pygments.rb (= 0.6.1)
       rdiscount (= 2.1.7)
       redcarpet (= 3.1.2)
       terminal-table (~> 1.4)
@@ -47,7 +47,7 @@ GEM
     html-pipeline (1.9.0)
       activesupport (>= 2)
       nokogiri (~> 1.4)
-    i18n (0.6.11)
+    i18n (0.7.0)
     jekyll (2.4.0)
       classifier-reborn (~> 2.0)
       colorator (~> 0.1)
@@ -63,52 +63,52 @@ GEM
       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-gist (1.1.0)
-    jekyll-mentions (0.1.3)
+    jekyll-mentions (0.2.1)
       html-pipeline (~> 1.9.0)
       jekyll (~> 2.0)
     jekyll-paginate (1.1.0)
     jekyll-redirect-from (0.6.2)
       jekyll (~> 2.0)
     jekyll-sass-converter (1.2.0)
       sass (~> 3.2)
-    jekyll-sitemap (0.6.0)
-    jekyll-watch (1.2.0)
+    jekyll-sitemap (0.6.3)
+    jekyll-watch (1.2.1)
       listen (~> 2.7)
-    jemoji (0.3.0)
+    jemoji (0.4.0)
       gemoji (~> 2.0)
       html-pipeline (~> 1.9)
       jekyll (~> 2.0)
-    json (1.8.1)
-    kramdown (1.3.1)
+    json (1.8.2)
+    kramdown (1.5.0)
     liquid (2.6.1)
-    listen (2.8.3)
+    listen (2.8.5)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     maruku (0.7.0)
     mercenary (0.3.5)
-    mini_portile (0.6.1)
-    minitest (5.4.3)
+    mini_portile (0.6.2)
+    minitest (5.5.1)
     net-dns (0.8.0)
-    nokogiri (1.6.5)
+    nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     parslet (1.5.0)
       blankslate (~> 2.0)
-    posix-spawn (0.3.9)
+    posix-spawn (0.3.10)
     public_suffix (1.4.6)
-    pygments.rb (0.6.0)
+    pygments.rb (0.6.1)
       posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
+      yajl-ruby (~> 1.2.0)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rdiscount (2.1.7)
     redcarpet (3.1.2)
     safe_yaml (1.0.4)
-    sass (3.4.9)
+    sass (3.4.13)
     terminal-table (1.4.5)
     thread_safe (0.3.4)
     timers (4.0.1)
@@ -117,7 +117,7 @@ GEM
       parslet (~> 1.5.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    yajl-ruby (1.1.0)
+    yajl-ruby (1.2.1)
 
 PLATFORMS
   ruby

_config.yml

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