Merge branch 'release/v.2.3.0'

Author: TheSeg

Gemfile.lock

@@ -8,7 +8,7 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    atomic (1.1.15)
+    atomic (1.1.16)
     blankslate (2.1.2.4)
     classifier (1.3.4)
       fast-stemmer (>= 1.0.0)
@@ -18,12 +18,12 @@ GEM
     fast-stemmer (1.0.2)
     ffi (1.9.3)
     gemoji (1.5.0)
-    github-pages (16)
+    github-pages (17)
       RedCloth (= 4.2.9)
-      jekyll (= 1.4.3)
-      jekyll-mentions (= 0.0.5)
+      jekyll (= 1.5.1)
+      jekyll-mentions (= 0.0.6)
       jekyll-redirect-from (= 0.3.1)
-      jemoji (= 0.0.10)
+      jemoji (= 0.1.0)
       kramdown (= 1.3.1)
       liquid (= 2.5.5)
       maruku (= 0.7.0)
@@ -34,36 +34,36 @@ GEM
       activesupport (>= 2)
       nokogiri (~> 1.4)
     i18n (0.6.9)
-    jekyll (1.4.3)
+    jekyll (1.5.1)
       classifier (~> 1.3)
       colorator (~> 0.1)
       commander (~> 4.1.3)
       liquid (~> 2.5.5)
       listen (~> 1.3)
-      maruku (~> 0.7.0)
+      maruku (= 0.7.0)
       pygments.rb (~> 0.5.0)
       redcarpet (~> 2.3.0)
-      safe_yaml (~> 0.9.7)
+      safe_yaml (~> 1.0)
       toml (~> 0.1.0)
-    jekyll-mentions (0.0.5)
+    jekyll-mentions (0.0.6)
       html-pipeline (~> 1.5.0)
-      jekyll (~> 1.4.3)
+      jekyll (~> 1.4)
     jekyll-redirect-from (0.3.1)
       jekyll (~> 1.4)
-    jemoji (0.0.10)
+    jemoji (0.1.0)
       gemoji (~> 1.5.0)
       html-pipeline (~> 1.5.0)
-      jekyll (~> 1.4.3)
+      jekyll (~> 1.4)
     kramdown (1.3.1)
     liquid (2.5.5)
     listen (1.3.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
     maruku (0.7.0)
-    mini_portile (0.5.2)
+    mini_portile (0.5.3)
     minitest (4.7.5)
-    multi_json (1.9.0)
+    multi_json (1.9.2)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     parslet (1.5.0)
@@ -79,8 +79,8 @@ GEM
       ffi (>= 0.5.0)
     rdiscount (2.1.7)
     redcarpet (2.3.0)
-    safe_yaml (0.9.7)
-    thread_safe (0.2.0)
+    safe_yaml (1.0.1)
+    thread_safe (0.3.1)
       atomic (>= 1.1.7, < 2)
     toml (0.1.1)
       parslet (~> 1.5.0)

bower.json

@@ -1,6 +1,6 @@
 {
     "name": "theseg.github.io",
-    "version": "1.2.1",
+    "version": "2.3.0",
     "description": "Resume website for John 'Seg' Seggerson.",
     "homepage": "http://theseg.github.io/",
     "bugs": "https://github.com/TheSeg/theseg.github.io/issues",
@@ -9,7 +9,7 @@
         "url": "http://theseg.github.io"
     },
     "dependencies": {
-        "jquery": "^2.0.3",
+        "jquery": "~2.1.0",
         "font-awesome": "~= 4.0.3",
         "holderjs": "^2.3.2",
         "html5shiv": "^3.7.0",

css/theme-default.css

@@ -1,21 +1,22 @@
 {
   "name": "theseg-github-io",
-  "version": "2.2.0",
-  "author": "John 'Seg' Seggerson <seg@segonmedia.com>",
+  "version": "2.3.0",
+  "author": "John *Seg* Seggerson <seg@segonmedia.com>",
   "homepage": "http://theseg.github.io/",
   "repository": {
     "type": "git",
     "url": "https://github.com/TheSeg/theseg.github.io.git"
   },
+  "private": true,
   "devDependencies": {
     "grunt": "~0.4.2",
-    "grunt-contrib-concat": "~0.3",
+    "grunt-contrib-concat": "~0.4.0",
     "grunt-contrib-copy": "~0.5",
-    "grunt-contrib-imagemin": "~0.5",
-    "grunt-contrib-jshint": "~0.8",
-    "grunt-contrib-less": "~0.9",
-    "grunt-contrib-uglify": "~0.3",
-    "grunt-contrib-watch": "~0.5",
-    "grunt-jekyll": "~0.4"
+    "grunt-contrib-imagemin": "~0.6.1",
+    "grunt-contrib-jshint": "~0.9.2",
+    "grunt-contrib-less": "~0.11.0",
+    "grunt-contrib-uglify": "~0.4.0",
+    "grunt-contrib-watch": "~0.6.1",
+    "grunt-jekyll": "~0.4.1"
   }
 }