Resolved conflict

.travis.yml

@@ -1,18 +1,14 @@
-language: node_js
 sudo: false
+language: "node_js"
 node_js:
   - "0.10"
   - "0.12"
   - "4"
   - "5"
   - "6"
-notifications:
-  email:
-    recipients:
-      - adam@apiary.io
-    on_success: change
-    on_failure: always
+
+before_install:
+  - "npm -g install npm@latest"
+
 after_success:
   - ./scripts/coveralls
-before_install:
-  - npm install -g npm@1.4.28

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gavel",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "Gavel HTTP validator JavaScript library",
   "main": "lib/gavel.js",
   "directories": {
@@ -11,37 +11,36 @@
   },
   "dependencies": {
     "amanda": "^0.5.1",
-    "async": "^1.0.0",
-    "caseless": "^0.10.0",
-    "clone": "^1.0.0",
-    "commander": "^2.6.0",
+    "async": "^2.0.0-rc.6",
+    "caseless": "^0.11.0",
+    "clone": "^1.0.2",
+    "commander": "^2.9.0",
     "curl-trace-parser": "0.0.8",
-    "deep-equal": "",
-    "googlediff": "0.1.0",
+    "deep-equal": "^1.0.1",
+    "googlediff": "^0.1.0",
     "http-string-parser": "0.0.5",
-    "is-type": "",
-    "json-pointer": "^0.3.0",
-    "jsonlint": "git://github.com/josdejong/jsonlint.git",
-    "media-typer": "~0.3.0",
-    "tv4": "~1.1.4"
+    "is-type": "0.0.1",
+    "json-pointer": "^0.5.0",
+    "jsonlint": "^1.6.2",
+    "media-typer": "^0.3.0",
+    "tv4": "^1.2.7"
   },
   "devDependencies": {
-    "chai": "^2.1.0",
-    "codo": "~2.0.6",
-    "coffee-coverage": "^0.6.0",
-    "coffee-script": "^1.9.1",
-    "coveralls": "~2.11.2",
-    "cucumber": "~0.4.8",
-    "jscoverage": "~0.5.4",
-    "lodash": "^3.3.0",
-    "mocha": "^2.1.0",
-    "mocha-lcov-reporter": "0.0.2",
-    "mochify": "^2.18.0",
-    "prettyjson": "^1.1.0",
-    "sinon": "^1.12.2"
+    "chai": "^3.5.0",
+    "codo": "^2.1.0",
+    "coffee-coverage": "^1.0.1",
+    "coffee-script": "^1.10.0",
+    "coveralls": "^2.11.9",
+    "cucumber": "1.0.0",
+    "jscoverage": "^0.6.0",
+    "lodash": "^4.13.1",
+    "mocha": "^2.5.3",
+    "mocha-lcov-reporter": "^1.2.0",
+    "prettyjson": "^1.1.3",
+    "sinon": "^1.17.4"
   },
   "scripts": {
-    "test": "scripts/test && ./scripts/mochify",
+    "test": "scripts/test",
     "prepublish": "scripts/build"
   },
   "repository": {
@@ -80,4 +79,4 @@
   "engines": {
     "node": "*"
   }
-}
+}