Merge branch 'release/v2.3.4'

Author: TheSeg

Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    activesupport (4.1.2)
+    activesupport (4.1.4)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -17,10 +17,10 @@ GEM
     fast-stemmer (1.0.2)
     ffi (1.9.3)
     gemoji (1.5.0)
-    github-pages (19)
+    github-pages (20)
       RedCloth (= 4.2.9)
       jekyll (= 1.5.1)
-      jekyll-mentions (= 0.0.6)
+      jekyll-mentions (= 0.0.9)
       jekyll-redirect-from (= 0.3.1)
       jekyll-sitemap (= 0.3.0)
       jemoji (= 0.1.0)
@@ -33,7 +33,7 @@ GEM
     html-pipeline (1.5.0)
       activesupport (>= 2)
       nokogiri (~> 1.4)
-    i18n (0.6.9)
+    i18n (0.6.11)
     jekyll (1.5.1)
       classifier (~> 1.3)
       colorator (~> 0.1)
@@ -45,7 +45,7 @@ GEM
       redcarpet (~> 2.3.0)
       safe_yaml (~> 1.0)
       toml (~> 0.1.0)
-    jekyll-mentions (0.0.6)
+    jekyll-mentions (0.0.9)
       html-pipeline (~> 1.5.0)
       jekyll (~> 1.4)
     jekyll-redirect-from (0.3.1)
@@ -65,8 +65,8 @@ GEM
       rb-kqueue (>= 0.2)
     maruku (0.7.0)
     mini_portile (0.6.0)
-    minitest (5.3.5)
-    nokogiri (1.6.2.1)
+    minitest (5.4.0)
+    nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
     parslet (1.5.0)
       blankslate (~> 2.0)

Gruntfile.js

@@ -136,12 +136,33 @@ module.exports = function(grunt) {
         nonull: true,
       },
     },
+    jshint: {
+      gruntfile: {
+        files: {
+          src: ['gruntfile.js']
+        }
+      },
+      concat_before: {
+        files: {
+          src: ['<%= dirs.js_src %>/**/*.js']
+        }
+      },
+      concat_after: {
+        files: {
+          src: ['<%= dirs.js_dist %>/seg_resume.js']
+        }
+      }
+    },
     watch: {
+      gruntfile: {
+        files: [ 'gruntfile.js' ],
+        tasks: [ 'jshint:gruntfile' ]
+      },
       js: {
         files: [
           "<%= dirs.js_src %>/*.js"
         ],
-        tasks: [ "concat:custom", "uglify:custom" ],
+        tasks: [ "jshint:concat_before", "concat:custom", "jshint:concat_after", "uglify:custom" ],
       },
       less: {
         files: [

_includes/content/speaking.html

@@ -1,10 +1,10 @@
   <div class="row">
     <div class="col-md-12">
       <h2>Shipping the Empty Box: Releasing [string:titleOfGame] on [array:platforms]</h2>
-      <h3><a href="http://dev.paxsite.com/">PAX Dev</a> <small>August 2014, Seattle, WA</small></h3>
+      <h3><a href="http://dev.paxsite.com/schedule/panel/shipping-the-empty-box-releasing-stringtitleofgame-on-arrayplatforms">PAX Dev</a> <small>August 2014, Seattle, WA</small></h3>
     </div>
     <div class="col-md-9 col-xs-12">
-      <p>Working on [string:titleOfGame], you need to release it on [array:platforms-0] and perhaps on [array:platforms-1] in the future. You have [int:NULL] time till release. Build engineer and programmer John “Seg” Seggerson (Telltale Games, John McNeil Studio, Domonique Pamplemousse) will help smooth the multi-platform release by outlining build engineering tips for platforms on desktop, mobile, console, and beyond. Increase artist, writer, and programmer efficiency with a set of core specifications and planning applied to existing platforms and future platforms. Skills and knowledge that will reduce release headaches for your [int:sizeOfTeam] team!</p>
+      <p>Working on [string:titleOfGame], you need to release it on [array:platforms-0] and perhaps on [array:platforms-1] in the future. You have [int:NULL] time till release. Build engineer and programmer John “Seg” Seggerson (Telltale Games, John McNeil Studio, Dominique Pamplemousse) will help smooth the multi-platform release by outlining build engineering tips for platforms on desktop, mobile, console, and beyond. Increase artist, writer, and programmer efficiency with a set of core specifications and planning applied to existing platforms and future platforms. Skills and knowledge that will reduce release headaches for your [int:sizeOfTeam] team!</p>
     </div>
     <div class="col-md-3 hidden-xs hidden-sm">
       <a href="http://dev.paxsite.com/"><img src="{{site.baseurl}}img/paxdevlogo.png" alt="PAX Dev" class="" /></a>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "theseg-github-io",
-  "version": "2.3.0",
+  "version": "2.3.4",
   "author": "John *Seg* Seggerson <seg@segonmedia.com>",
   "homepage": "http://theseg.github.io/",
   "repository": {
@@ -9,8 +9,8 @@
   },
   "private": true,
   "devDependencies": {
-    "grunt": "~0.4.2",
-    "grunt-contrib-concat": "~0.4.0",
+    "grunt": "~0.4.5",
+    "grunt-contrib-concat": "^0.5.0",
     "grunt-contrib-copy": "~0.5",
     "grunt-contrib-imagemin": "~0.7.1",
     "grunt-contrib-jshint": "~0.10.0",