Update gems and update plugins to support latest Jekyll

Gemfile.lock

@@ -1,76 +1,102 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    blankslate (2.1.2.4)
     breakpoint (1.3)
       compass (>= 0.12.1)
       sass (>= 3.2.0)
-    chunky_png (1.2.9)
-    classifier (1.3.3)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    chunky_png (1.3.1)
+    classifier (1.3.4)
       fast-stemmer (>= 1.0.0)
-    coffee-script (2.2.0)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.3)
+    coffee-script-source (1.7.1)
     colorator (0.1)
-    commander (4.1.5)
-      highline (~> 1.6.11)
-    compass (0.12.2)
+    compass (0.12.7)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
-      sass (~> 3.1)
-    execjs (2.0.2)
+      sass (~> 3.2.19)
+    execjs (2.2.1)
     fast-stemmer (1.0.2)
     ffi (1.9.3)
     fssm (0.2.10)
-    highline (1.6.20)
     hike (1.2.3)
-    jekyll (1.3.1)
+    jekyll (2.1.1)
       classifier (~> 1.3)
       colorator (~> 0.1)
-      commander (~> 4.1.3)
-      liquid (~> 2.5.2)
-      listen (~> 1.3)
-      maruku (~> 0.6.0)
-      pygments.rb (~> 0.5.0)
-      redcarpet (~> 2.3.0)
-      safe_yaml (~> 0.9.7)
-    jekyll-assets (0.7.4)
-      jekyll (~> 1.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-assets (0.8.1)
+      jekyll (>= 1.0.0, < 3.0.0)
+      sass
+      sass
+      sass
+      sass
       sprockets (~> 2.10)
+      sprockets-helpers
+      sprockets-sass
+    jekyll-coffeescript (1.0.0)
+      coffee-script (~> 2.2)
+    jekyll-gist (1.1.0)
+    jekyll-paginate (1.0.0)
+    jekyll-sass-converter (1.0.0)
+      sass (~> 3.2)
+    jekyll-watch (1.0.0)
+      listen (~> 2.7)
     json (1.8.1)
-    liquid (2.5.4)
-    listen (1.3.1)
+    kramdown (1.4.0)
+    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.6.1)
-      syntax (>= 1.0.0)
-    multi_json (1.8.2)
-    posix-spawn (0.3.6)
-    pygments.rb (0.5.4)
+    mercenary (0.3.4)
+    multi_json (1.10.1)
+    parslet (1.5.0)
+      blankslate (~> 2.0)
+    posix-spawn (0.3.8)
+    pygments.rb (0.6.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rack (1.5.2)
-    rake (10.1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.2)
+    rake (10.3.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
-      ffi (>= 0.5.0)
-    redcarpet (2.3.0)
+    redcarpet (3.1.2)
     respond-to (2.6)
       breakpoint (>= 1.3)
-    rubyzip (1.1.0)
-    safe_yaml (0.9.7)
-    sass (3.2.12)
-    sprockets (2.10.1)
+    rubyzip (1.1.6)
+    safe_yaml (1.0.3)
+    sass (3.2.19)
+    sprockets (2.12.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    syntax (1.0.0)
+    sprockets-helpers (1.1.0)
+      sprockets (~> 2.0)
+    sprockets-sass (1.2.0)
+      sprockets (~> 2.0)
+      tilt (~> 1.1)
     tilt (1.4.1)
-    uglifier (2.3.1)
+    timers (1.1.0)
+    toml (0.1.1)
+      parslet (~> 1.5.0)
+    uglifier (2.5.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     yajl-ruby (1.1.0)

_plugins/archives.rb

@@ -53,9 +53,8 @@ def self.included base
 
           def site_payload
             years = posts.map{ |p| p.date.year }.uniq.sort.reverse
-            site_payload_without_archive_years.deep_merge({
+            Utils.deep_merge_hashes site_payload_without_archive_years,
               'site' => { 'archive_years' => years }
-            })
           end
         end
       end
@@ -107,21 +106,20 @@ def destination dest
       end
 
       def render(layouts, site_payload)
-        payload = { 'page' => self.to_liquid }.deep_merge(site_payload)
-        do_layout(payload, layouts)
+        page_payload = { 'page' => self.to_liquid }
+        do_layout(Utils.deep_merge_hashes(page_payload, site_payload), layouts)
       end
 
       def title
         site.archives_config.title.gsub(/\{year\}/, @year.to_s)
       end
 
       def to_liquid
-        self.data.deep_merge({
+        Utils.deep_merge_hashes self.data,
           "url"       => url,
           "content"   => self.content,
           "title"     => self.title,
           "posts"     => @posts
-        })
       end
 
       def write dest

_plugins/categories.rb

@@ -63,9 +63,8 @@ def self.included base
           alias_method :to_liquid_without_category, :to_liquid
 
           def to_liquid(*args)
-            to_liquid_without_category(*args).deep_merge({
+            Utils.deep_merge_hashes to_liquid_without_category(*args),
               'category' => categories.first
-            })
           end
         end
       end
@@ -83,7 +82,7 @@ def categories_with_better_autoguess
         protected
 
         def get_categories_from_data
-          self.data.pluralized_array('category', 'categories')
+          Utils.pluralized_array_from_hash self.data, 'category', 'categories'
         end
 
         def get_categories_from_name
@@ -135,21 +134,20 @@ def destination dest
       end
 
       def render(layouts, site_payload)
-        payload = { 'page' => self.to_liquid }.deep_merge(site_payload)
-        do_layout(payload, layouts)
+        page_payload = { 'page' => self.to_liquid }
+        do_layout(Utils.deep_merge_hashes(page_payload, site_payload), layouts)
       end
 
       def title
         site.categories_config.title.gsub(/\{category\}/, @category)
       end
 
       def to_liquid
-        self.data.deep_merge({
+        Utils.deep_merge_hashes self.data,
           "url"       => url,
           "content"   => self.content,
           "title"     => self.title,
           "posts"     => @posts
-        })
       end
 
       def write dest

_plugins/tags.rb

@@ -90,21 +90,20 @@ def destination dest
       end
 
       def render(layouts, site_payload)
-        payload = { 'page' => self.to_liquid }.deep_merge(site_payload)
-        do_layout(payload, layouts)
+        page_payload = { 'page' => self.to_liquid }
+        do_layout(Utils.deep_merge_hashes(page_payload, site_payload), layouts)
       end
 
       def title
         site.tags_config.title.gsub(/\{tag\}/, @tag)
       end
 
       def to_liquid
-        self.data.deep_merge({
+        Utils.deep_merge_hashes self.data,
           "url"       => url,
           "content"   => self.content,
           "title"     => self.title,
           "posts"     => @posts
-        })
       end
 
       def write dest

_plugins/zipballs.rb

@@ -80,8 +80,12 @@ def initialize site, source
         @site, @source = site, source
       end
 
+      def relative_path
+        File.join(@site.zipballs_config.dirname, filename)
+      end
+
       def destination dest
-        File.join(dest, @site.zipballs_config.dirname, filename)
+        File.join dest, relative_path
       end
 
       def filename