diff --git a/client/app/bundles/Comments/startup/serverGlobals.jsx b/client/app/bundles/Comments/startup/serverGlobals.jsx
index 88fcccf13..cb825b2eb 100644
--- a/client/app/bundles/Comments/startup/serverGlobals.jsx
+++ b/client/app/bundles/Comments/startup/serverGlobals.jsx
@@ -7,4 +7,3 @@ import RouterApp from './ServerRouterApp';
 // NodeJs: https://nodejs.org/api/globals.html#globals_global
 global.App = App;
 global.RouterApp = RouterApp;
-
diff --git a/client/npm-shrinkwrap.json b/client/npm-shrinkwrap.json
index c396c40d7..a87699dc6 100644
--- a/client/npm-shrinkwrap.json
+++ b/client/npm-shrinkwrap.json
@@ -34,11 +34,6 @@
         }
       }
     },
-    "acorn-to-esprima": {
-      "version": "1.0.7",
-      "from": "acorn-to-esprima@>=1.0.5 <2.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-to-esprima/-/acorn-to-esprima-1.0.7.tgz"
-    },
     "align-text": {
       "version": "0.1.3",
       "from": "align-text@>=0.1.0 <0.2.0",
@@ -221,6 +216,11 @@
       "from": "axios@>=0.7.0 <0.8.0",
       "resolved": "https://registry.npmjs.org/axios/-/axios-0.7.0.tgz"
     },
+    "babel-code-frame": {
+      "version": "6.3.13",
+      "from": "babel-code-frame@>=6.3.13 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.3.13.tgz"
+    },
     "babel-core": {
       "version": "5.8.34",
       "from": "babel-core@>=5.8.25 <6.0.0",
@@ -236,6 +236,11 @@
       "from": "babel-loader@>=5.3.2 <6.0.0",
       "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-5.4.0.tgz"
     },
+    "babel-messages": {
+      "version": "6.3.13",
+      "from": "babel-messages@>=6.3.13 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.3.13.tgz"
+    },
     "babel-plugin-constant-folding": {
       "version": "1.0.1",
       "from": "babel-plugin-constant-folding@>=1.0.1 <2.0.0",
@@ -316,6 +321,27 @@
       "from": "babel-runtime@>=5.8.25 <6.0.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.8.34.tgz"
     },
+    "babel-traverse": {
+      "version": "6.3.15",
+      "from": "babel-traverse@>=6.0.20 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.3.15.tgz",
+      "dependencies": {
+        "babylon": {
+          "version": "6.3.15",
+          "from": "babylon@>=6.3.15 <7.0.0"
+        },
+        "globals": {
+          "version": "8.14.0",
+          "from": "globals@>=8.3.0 <9.0.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-8.14.0.tgz"
+        }
+      }
+    },
+    "babel-types": {
+      "version": "6.3.14",
+      "from": "babel-types@>=6.0.19 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.3.14.tgz"
+    },
     "babylon": {
       "version": "5.8.34",
       "from": "babylon@>=5.8.34 <6.0.0",
@@ -2938,7 +2964,7 @@
     },
     "node-uuid": {
       "version": "1.4.7",
-      "from": "node-uuid@>=1.4.7 <2.0.0",
+      "from": "node-uuid@>=1.4.2 <2.0.0",
       "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
     },
     "nomnom": {
diff --git a/client/package.json b/client/package.json
index 31cd2f018..417b5b3a6 100644
--- a/client/package.json
+++ b/client/package.json
@@ -64,7 +64,7 @@
     "webpack": "^1.12.8"
   },
   "devDependencies": {
-    "babel-eslint": "^4.1.5",
+    "babel-eslint": "^5.0.0-beta4",
     "babel-plugin-react-transform": "^1.1.1",
     "bootstrap-sass": "^3.3.5",
     "bootstrap-sass-loader": "^1.0.9",
@@ -72,7 +72,7 @@
     "chai-immutable": "^1.5.3",
     "css-loader": "^0.23.0",
     "eslint": "^1.10.1",
-    "eslint-config-airbnb": "1.0.0",
+    "eslint-config-airbnb": "1.0.2",
     "eslint-plugin-react": "^3.11.3",
     "esprima-fb": "^15001.1001.0-dev-harmony-fb",
     "express": "^4.13.3",
diff --git a/client/webpack.client.base.config.js b/client/webpack.client.base.config.js
index 578b135c1..2bbe5595c 100644
--- a/client/webpack.client.base.config.js
+++ b/client/webpack.client.base.config.js
@@ -16,7 +16,6 @@ module.exports = {
     vendor: [
       'babel-core/polyfill',
       'jquery',
-      'jquery-ujs',
       'react',
       'react-dom',
     ],
diff --git a/client/webpack.client.rails.config.js b/client/webpack.client.rails.config.js
index d55f59065..81bd31ecc 100644
--- a/client/webpack.client.rails.config.js
+++ b/client/webpack.client.rails.config.js
@@ -20,6 +20,12 @@ config.entry.vendor.unshift(
   'es5-shim/es5-sham'
 );
 
+// jquery-ujs MUST GO AFTER jquery, so must use 'push'
+config.entry.app.push(
+  'jquery-ujs',
+  './app/startup/clientGlobals'
+);
+
 // See webpack.common.config for adding modules common to both the webpack dev server and rails
 
 config.module.loaders.push(