Merge pull request #378 from kentmw/master

#371 - making jquery 2.2.4 work. Haven't tested beyond that

package.json

@@ -47,8 +47,8 @@
     "jasmine-core": "^2.4.1",
     "jasmine-reporters": "2.0.2",
     "jasmine-spec-reporter": "2.1.0",
-    "jquery": ">=2.1.3 <2.2.0",
-    "jquery-mockjax": "1.6.1",
+    "jquery": "2.2.4",
+    "jquery-mockjax": "2.2.1",
     "jsdom": "3.0.2",
     "jshint-stylish": "^1.0.1",
     "karma": "^0.13.19",

test/karma/helpers/mockjax.js

@@ -1,6 +1,6 @@
 var _ = require('underscore');
 jQuery = $ = require('jquery');
-require('jquery-mockjax');
+require('jquery-mockjax')($, window);
 
 module.exports = function() {
   var routes = {};

torso-bundle.js

@@ -1773,28 +1773,6 @@
 }));
 
 
-(function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    define(['./Cell'], factory);
-  } else if (typeof exports === 'object') {
-    module.exports = factory(require('./Cell'));
-  } else {
-    root.Torso = root.Torso || {};
-    root.Torso.ServiceCell = factory(root.Torso.Cell);
-  }
-}(this, function(Cell) {
-  'use strict';
-  /**
-   * A service cell is a event listening and event emitting object that is independent of any model or view.
-   * @module    Torso
-   * @class  ServiceCell
-   * @author [email protected]
-   */
-  var ServiceCell = Cell.extend({ });
-
-  return ServiceCell;
-}));
-
 (function(root, factory) {
   if (typeof define === 'function' && define.amd) {
     define(['underscore', 'backbone', './templateRenderer', './Cell', './NestedCell'], factory);
@@ -3322,6 +3300,28 @@
 
   return View;
 }));
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    define(['./Cell'], factory);
+  } else if (typeof exports === 'object') {
+    module.exports = factory(require('./Cell'));
+  } else {
+    root.Torso = root.Torso || {};
+    root.Torso.ServiceCell = factory(root.Torso.Cell);
+  }
+}(this, function(Cell) {
+  'use strict';
+  /**
+   * A service cell is a event listening and event emitting object that is independent of any model or view.
+   * @module    Torso
+   * @class  ServiceCell
+   * @author [email protected]
+   */
+  var ServiceCell = Cell.extend({ });
+
+  return ServiceCell;
+}));
+
 (function(root, factory) {
   if (typeof define === 'function' && define.amd) {
     define(['underscore', './NestedModel'], factory);