merge

diff --cc npm-shrinkwrap.json
index 58a59c9,382a101..d6d9930
--- 1/npm-shrinkwrap.json
--- 2/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@@ -2018,14 -1854,8 +2018,9 @@@
      },
      "underscore.string": {
        "version": "2.3.3",
 -      "from": "underscore.string@~2.3.3"
 +      "from": "underscore.string@~2.3.3",
 +      "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"
      },
-     "ursa": {
-       "version": "0.8.0",
-       "from": "ursa@0.8.x",
-       "resolved": "https://registry.npmjs.org/ursa/-/ursa-0.8.0.tgz"
-     },
      "winston": {
        "version": "0.7.3",
        "from": "winston@0.7.x",

diff --cc package.json
Simple merge