Merge darrrk/chai-json-schema

Conflicts:
	package.json

Author: Paul Thompson

README.md

@@ -204,6 +204,7 @@ before(function (done) {
 
 ## History
 
+* 1.2.0 - Dependency update - Chai 2.x
 * 1.1.0 - Dependency update
 * 1.0.10 - AMD loader support
 * 1.0.9 - Published to bower.

bower.json

@@ -1,6 +1,6 @@
 {
 	"name": "chai-json-schema",
-	"version": "1.1.0",
+	"version": "1.2.0",
 	"main": "index.js",
 	"ignore": [
 		"**/.*",
@@ -10,7 +10,7 @@
 		"test/"
 	],
 	"dependencies": {
-		"tv4": "~1.0.16",
+		"tv4": "~1.1.9",
 		"jsonpointer.js": "~0.3.0"
 	}
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "chai-json-schema",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Chai plugin for JSON Schema v4",
   "author": {
     "name": "Bart van der Schoor",
@@ -44,7 +44,7 @@
   "devDependencies": {
     "grunt": "~0.4.2",
     "grunt-cli": "~0.1",
-    "chai": "~1.9.0",
+    "chai": "^2.0",
     "mocha": "~1.18.0",
     "grunt-mocha": "~0.4.10",
     "grunt-contrib-jshint": "~0.9.2",