Merge branch 'trickeyone-master'

Author: JrSchild

bower.json

@@ -10,7 +10,7 @@
     "test/"
   ],
   "dependencies": {
-    "tv4": "~1.1.9",
-    "jsonpointer.js": "~0.3.0"
+    "tv4": "~1.2.7",
+    "jsonpointer.js": "~0.4.0"
   }
 }

package.json

@@ -42,21 +42,21 @@
     "test": "grunt test"
   },
   "dependencies": {
-    "jsonpointer.js": "0.3.0",
-    "tv4": "~1.1.9"
+    "jsonpointer.js": "0.4.0",
+    "tv4": "~1.2.7"
   },
   "devDependencies": {
+    "chai": "^3.5.0",
     "grunt": "~0.4.2",
+    "grunt-bump": "~0.3.x",
     "grunt-cli": "~0.1",
-    "chai": "^3.0",
-    "mocha": "~1.18.0",
+    "grunt-continue": "0.0.1",
+    "grunt-contrib-jshint": "~0.11.x",
     "grunt-mocha": "~0.4.10",
-    "grunt-contrib-jshint": "~0.9.2",
+    "grunt-mocha-test": "~0.12.x",
     "jshint-path-reporter": "~0.1",
-    "grunt-continue": "0.0.1",
-    "grunt-mocha-test": "~0.10.0",
+    "mocha": "^2.4.5",
     "mocha-unfunk-reporter": "~0.4.0",
-    "grunt-bump": "0.0.11",
     "requirejs": "~2.1.11"
   },
   "peerDependencies": {