From f5780e723bcdcb45929fd5e4d9981bdf07353bc3 Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Wed, 31 Dec 2014 01:00:26 -0500
Subject: [PATCH] ruby / gem updates

---
 .ruby-version |  2 +-
 Gemfile       |  2 +-
 Gemfile.lock  | 60 ++++++++++++++++++++++++++-------------------------
 3 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index ac2cdeb..cd57a8b 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.1.3
+2.1.5
diff --git a/Gemfile b/Gemfile
index 903a384..76c4d91 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem 'octopress', '~> 3.0.0.rc.15'
+gem 'octopress', '~> 3.0.0.rc'
 gem 'narray', :git => "https://github.com/tonyarnold/narray"
 gem 'gsl', :git => "https://github.com/tonyarnold/rb-gsl"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 2fca5fd..8698462 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -14,13 +14,14 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.3.6)
     blankslate (2.1.2.4)
-    bourbon (4.0.2)
+    bourbon (4.1.0)
       sass (~> 3.3)
       thor
     celluloid (0.16.0)
       timers (~> 4.0.0)
-    classifier-reborn (2.0.1)
+    classifier-reborn (2.0.3)
       fast-stemmer (~> 1.0)
     coffee-script (2.3.0)
       coffee-script-source
@@ -30,18 +31,19 @@ GEM
     colored (1.2)
     ethon (0.7.1)
       ffi (>= 1.3.0)
-    execjs (2.2.1)
+    execjs (2.2.2)
     fast-stemmer (1.0.2)
-    ffi (1.9.5)
+    ffi (1.9.6)
     hitimes (1.2.2)
-    html-proofer (1.4.0)
+    html-proofer (1.6.0)
+      addressable (~> 2.3)
       colored (~> 1.2)
       mercenary (~> 0.3.2)
       nokogiri (~> 1.5)
       parallel (~> 1.3)
       typhoeus (~> 0.6.7)
       yell (~> 2.0)
-    jekyll (2.4.0)
+    jekyll (2.5.3)
       classifier-reborn (~> 2.0)
       colorator (~> 0.1)
       jekyll-coffeescript (~> 1.0)
@@ -59,42 +61,42 @@ GEM
     jekyll-coffeescript (1.0.1)
       coffee-script (~> 2.2)
     jekyll-gist (1.1.0)
-    jekyll-paginate (1.0.0)
-    jekyll-sass-converter (1.2.1)
+    jekyll-paginate (1.1.0)
+    jekyll-sass-converter (1.3.0)
       sass (~> 3.2)
-    jekyll-watch (1.1.1)
+    jekyll-watch (1.2.0)
       listen (~> 2.7)
-    kramdown (1.4.2)
+    kramdown (1.5.0)
     liquid (2.6.1)
-    listen (2.7.11)
+    listen (2.8.4)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    mercenary (0.3.4)
-    mini_portile (0.6.0)
-    neat (1.6.0)
-      bourbon (>= 3.1)
+    mercenary (0.3.5)
+    mini_portile (0.6.2)
+    neat (1.7.0)
+      bourbon (>= 4.0)
       sass (>= 3.3)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
-    octopress (3.0.0.rc.15)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
+    octopress (3.0.0.rc.23)
       jekyll (~> 2.0)
       mercenary (~> 0.3.2)
       octopress-deploy
       octopress-docs
       titlecase
-    octopress-deploy (1.0.0)
+    octopress-deploy (1.0.1)
       colorator
       octopress-docs
-    octopress-docs (0.0.8)
+    octopress-docs (0.0.13)
       jekyll (~> 2.0)
-      octopress-escape-code (~> 1.0)
+      octopress-escape-code (~> 2.0)
       octopress-hooks (~> 2.0)
-    octopress-escape-code (1.0.2)
+    octopress-escape-code (2.0.1)
       octopress-hooks (~> 2.0)
-    octopress-hooks (2.2.1)
+    octopress-hooks (2.2.3)
       jekyll (~> 2.0)
-    parallel (1.3.2)
+    parallel (1.3.3)
     parslet (1.5.0)
       blankslate (~> 2.0)
     posix-spawn (0.3.9)
@@ -104,19 +106,19 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    redcarpet (3.1.2)
+    redcarpet (3.2.2)
     safe_yaml (1.0.4)
-    sass (3.4.5)
+    sass (3.4.9)
     thor (0.19.1)
     timers (4.0.1)
       hitimes
     titlecase (0.1.1)
-    toml (0.1.1)
+    toml (0.1.2)
       parslet (~> 1.5.0)
     typhoeus (0.6.9)
       ethon (>= 0.7.1)
     yajl-ruby (1.1.0)
-    yell (2.0.4)
+    yell (2.0.5)
 
 PLATFORMS
   ruby
@@ -127,4 +129,4 @@ DEPENDENCIES
   html-proofer
   narray!
   neat
-  octopress (~> 3.0.0.rc.15)
+  octopress (~> 3.0.0.rc)