diff --git a/docs/app/e2e/app.scenario.js b/docs/app/e2e/app.scenario.js
index 829323bb6..4bacb00de 100644
--- a/docs/app/e2e/app.scenario.js
+++ b/docs/app/e2e/app.scenario.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var webdriver = require('protractor/node_modules/selenium-webdriver');
+var webdriver = require('selenium-webdriver');
 
 describe('docs.angularjs.org', function() {
 
diff --git a/karma-shared.conf.js b/karma-shared.conf.js
index ee4c78d00..44acad709 100644
--- a/karma-shared.conf.js
+++ b/karma-shared.conf.js
@@ -170,8 +170,8 @@ module.exports = function(config, specificOptions) {
     '/someSanitizedUrl',
     '/{{testUrl}}'
   ];
-  var log4js = require('./node_modules/karma/node_modules/log4js');
-  var layouts = require('./node_modules/karma/node_modules/log4js/lib/layouts');
+  var log4js = require('log4js');
+  var layouts = require('log4js/lib/layouts');
   var originalConfigure = log4js.configure;
   log4js.configure = function(log4jsConfig) {
     var consoleAppender = log4jsConfig.appenders.shift();
diff --git a/lib/grunt/plugins.js b/lib/grunt/plugins.js
index 6a436505a..9f3577db3 100644
--- a/lib/grunt/plugins.js
+++ b/lib/grunt/plugins.js
@@ -39,7 +39,7 @@ module.exports = function(grunt) {
 
 
   grunt.registerTask('docs', 'create angular docs', function() {
-    var gruntProc = shelljs.exec('"node_modules/.bin/gulp" --gulpfile docs/gulpfile.js');
+    var gruntProc = shelljs.exec('node "' + require.resolve('gulp/bin/gulp') + '" --gulpfile docs/gulpfile.js');
     if (gruntProc.code !== 0) {
       throw new Error('doc generation failed');
     }
diff --git a/lib/grunt/utils.js b/lib/grunt/utils.js
index 9837478b7..0208d5428 100644
--- a/lib/grunt/utils.js
+++ b/lib/grunt/utils.js
@@ -15,7 +15,7 @@ module.exports = {
     var reporters = grunt.option('reporters');
     var noColor = grunt.option('no-colors');
     var port = grunt.option('port');
-    var p = spawn('node', ['node_modules/karma/bin/karma', 'start', config,
+    var p = spawn('node', [require.resolve('karma/bin/karma'), 'start', config,
       singleRun ? '--single-run=true' : '',
       reporters ? '--reporters=' + reporters : '',
       browsers ? '--browsers=' + browsers : '',
@@ -38,7 +38,7 @@ module.exports = {
       done();
       return;
     }
-    var p = spawn('node', ['node_modules/protractor/bin/webdriver-manager', 'update']);
+    var p = spawn('node', [require.resolve('protractor/bin/webdriver-manager'), 'update']);
     p.stdout.pipe(process.stdout);
     p.stderr.pipe(process.stderr);
     p.on('exit', function(code) {
@@ -54,7 +54,7 @@ module.exports = {
     var sauceBuild = grunt.option('capabilities.build');
     var browser = grunt.option('browser');
     var specs = grunt.option('specs');
-    var args = ['node_modules/protractor/bin/protractor', config];
+    var args = [require.resolve('protractor/bin/protractor'), config];
     if (sauceUser) args.push('--sauceUser=' + sauceUser);
     if (sauceKey) args.push('--sauceKey=' + sauceKey);
     if (tunnelIdentifier) args.push('--capabilities.tunnel-identifier=' + tunnelIdentifier);
diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json
index 76d70d6cb..7ada350a5 100644
--- a/npm-shrinkwrap.clean.json
+++ b/npm-shrinkwrap.clean.json
@@ -2933,14 +2933,6 @@
                 },
                 "async-each": {
                   "version": "0.1.6"
-                },
-                "fsevents": {
-                  "version": "0.3.8",
-                  "dependencies": {
-                    "nan": {
-                      "version": "2.4.0"
-                    }
-                  }
                 }
               }
             }
@@ -6966,378 +6958,6 @@
                   "version": "1.0.1"
                 }
               }
-            },
-            "fsevents": {
-              "version": "1.0.14",
-              "dependencies": {
-                "nan": {
-                  "version": "2.4.0"
-                },
-                "node-pre-gyp": {
-                  "version": "0.6.29"
-                },
-                "abbrev": {
-                  "version": "1.0.9"
-                },
-                "ansi-regex": {
-                  "version": "2.0.0"
-                },
-                "ansi-styles": {
-                  "version": "2.2.1"
-                },
-                "aproba": {
-                  "version": "1.0.4"
-                },
-                "are-we-there-yet": {
-                  "version": "1.1.2"
-                },
-                "asn1": {
-                  "version": "0.2.3"
-                },
-                "assert-plus": {
-                  "version": "0.2.0"
-                },
-                "async": {
-                  "version": "1.5.2"
-                },
-                "aws-sign2": {
-                  "version": "0.6.0"
-                },
-                "aws4": {
-                  "version": "1.4.1"
-                },
-                "balanced-match": {
-                  "version": "0.4.2"
-                },
-                "block-stream": {
-                  "version": "0.0.9"
-                },
-                "boom": {
-                  "version": "2.10.1"
-                },
-                "brace-expansion": {
-                  "version": "1.1.5"
-                },
-                "buffer-shims": {
-                  "version": "1.0.0"
-                },
-                "caseless": {
-                  "version": "0.11.0"
-                },
-                "code-point-at": {
-                  "version": "1.0.0"
-                },
-                "chalk": {
-                  "version": "1.1.3"
-                },
-                "combined-stream": {
-                  "version": "1.0.5"
-                },
-                "commander": {
-                  "version": "2.9.0"
-                },
-                "concat-map": {
-                  "version": "0.0.1"
-                },
-                "console-control-strings": {
-                  "version": "1.1.0"
-                },
-                "core-util-is": {
-                  "version": "1.0.2"
-                },
-                "cryptiles": {
-                  "version": "2.0.5"
-                },
-                "debug": {
-                  "version": "2.2.0"
-                },
-                "deep-extend": {
-                  "version": "0.4.1"
-                },
-                "delayed-stream": {
-                  "version": "1.0.0"
-                },
-                "delegates": {
-                  "version": "1.0.0"
-                },
-                "ecc-jsbn": {
-                  "version": "0.1.1"
-                },
-                "escape-string-regexp": {
-                  "version": "1.0.5"
-                },
-                "extend": {
-                  "version": "3.0.0"
-                },
-                "extsprintf": {
-                  "version": "1.0.2"
-                },
-                "forever-agent": {
-                  "version": "0.6.1"
-                },
-                "form-data": {
-                  "version": "1.0.0-rc4"
-                },
-                "fs.realpath": {
-                  "version": "1.0.0"
-                },
-                "fstream": {
-                  "version": "1.0.10"
-                },
-                "fstream-ignore": {
-                  "version": "1.0.5"
-                },
-                "gauge": {
-                  "version": "2.6.0"
-                },
-                "generate-function": {
-                  "version": "2.0.0"
-                },
-                "generate-object-property": {
-                  "version": "1.2.0"
-                },
-                "glob": {
-                  "version": "7.0.5"
-                },
-                "graceful-fs": {
-                  "version": "4.1.4"
-                },
-                "graceful-readlink": {
-                  "version": "1.0.1"
-                },
-                "har-validator": {
-                  "version": "2.0.6"
-                },
-                "has-ansi": {
-                  "version": "2.0.0"
-                },
-                "has-color": {
-                  "version": "0.1.7"
-                },
-                "has-unicode": {
-                  "version": "2.0.1"
-                },
-                "hawk": {
-                  "version": "3.1.3"
-                },
-                "hoek": {
-                  "version": "2.16.3"
-                },
-                "http-signature": {
-                  "version": "1.1.1"
-                },
-                "inflight": {
-                  "version": "1.0.5"
-                },
-                "inherits": {
-                  "version": "2.0.1"
-                },
-                "ini": {
-                  "version": "1.3.4"
-                },
-                "is-fullwidth-code-point": {
-                  "version": "1.0.0"
-                },
-                "is-my-json-valid": {
-                  "version": "2.13.1"
-                },
-                "is-property": {
-                  "version": "1.0.2"
-                },
-                "is-typedarray": {
-                  "version": "1.0.0"
-                },
-                "isarray": {
-                  "version": "1.0.0"
-                },
-                "isstream": {
-                  "version": "0.1.2"
-                },
-                "jodid25519": {
-                  "version": "1.0.2"
-                },
-                "jsbn": {
-                  "version": "0.1.0"
-                },
-                "json-schema": {
-                  "version": "0.2.2"
-                },
-                "json-stringify-safe": {
-                  "version": "5.0.1"
-                },
-                "jsonpointer": {
-                  "version": "2.0.0"
-                },
-                "jsprim": {
-                  "version": "1.3.0"
-                },
-                "mime-db": {
-                  "version": "1.23.0"
-                },
-                "mime-types": {
-                  "version": "2.1.11"
-                },
-                "minimatch": {
-                  "version": "3.0.2"
-                },
-                "minimist": {
-                  "version": "0.0.8"
-                },
-                "mkdirp": {
-                  "version": "0.5.1"
-                },
-                "ms": {
-                  "version": "0.7.1"
-                },
-                "node-uuid": {
-                  "version": "1.4.7"
-                },
-                "nopt": {
-                  "version": "3.0.6"
-                },
-                "npmlog": {
-                  "version": "3.1.2"
-                },
-                "number-is-nan": {
-                  "version": "1.0.0"
-                },
-                "oauth-sign": {
-                  "version": "0.8.2"
-                },
-                "object-assign": {
-                  "version": "4.1.0"
-                },
-                "once": {
-                  "version": "1.3.3"
-                },
-                "path-is-absolute": {
-                  "version": "1.0.0"
-                },
-                "pinkie": {
-                  "version": "2.0.4"
-                },
-                "pinkie-promise": {
-                  "version": "2.0.1"
-                },
-                "process-nextick-args": {
-                  "version": "1.0.7"
-                },
-                "qs": {
-                  "version": "6.2.0"
-                },
-                "readable-stream": {
-                  "version": "2.1.4"
-                },
-                "request": {
-                  "version": "2.73.0"
-                },
-                "rimraf": {
-                  "version": "2.5.3"
-                },
-                "set-blocking": {
-                  "version": "2.0.0"
-                },
-                "semver": {
-                  "version": "5.2.0"
-                },
-                "signal-exit": {
-                  "version": "3.0.0"
-                },
-                "sntp": {
-                  "version": "1.0.9"
-                },
-                "string-width": {
-                  "version": "1.0.1"
-                },
-                "string_decoder": {
-                  "version": "0.10.31"
-                },
-                "stringstream": {
-                  "version": "0.0.5"
-                },
-                "strip-ansi": {
-                  "version": "3.0.1"
-                },
-                "strip-json-comments": {
-                  "version": "1.0.4"
-                },
-                "supports-color": {
-                  "version": "2.0.0"
-                },
-                "tar": {
-                  "version": "2.2.1"
-                },
-                "tar-pack": {
-                  "version": "3.1.4"
-                },
-                "tough-cookie": {
-                  "version": "2.2.2"
-                },
-                "tunnel-agent": {
-                  "version": "0.4.3"
-                },
-                "tweetnacl": {
-                  "version": "0.13.3"
-                },
-                "uid-number": {
-                  "version": "0.0.6"
-                },
-                "util-deprecate": {
-                  "version": "1.0.2"
-                },
-                "verror": {
-                  "version": "1.3.6"
-                },
-                "wide-align": {
-                  "version": "1.1.0"
-                },
-                "wrappy": {
-                  "version": "1.0.2"
-                },
-                "xtend": {
-                  "version": "4.0.1"
-                },
-                "bl": {
-                  "version": "1.1.2",
-                  "dependencies": {
-                    "readable-stream": {
-                      "version": "2.0.6"
-                    }
-                  }
-                },
-                "dashdash": {
-                  "version": "1.14.0",
-                  "dependencies": {
-                    "assert-plus": {
-                      "version": "1.0.0"
-                    }
-                  }
-                },
-                "getpass": {
-                  "version": "0.1.6",
-                  "dependencies": {
-                    "assert-plus": {
-                      "version": "1.0.0"
-                    }
-                  }
-                },
-                "rc": {
-                  "version": "1.1.6",
-                  "dependencies": {
-                    "minimist": {
-                      "version": "1.2.0"
-                    }
-                  }
-                },
-                "sshpk": {
-                  "version": "1.8.3",
-                  "dependencies": {
-                    "assert-plus": {
-                      "version": "1.0.0"
-                    }
-                  }
-                }
-              }
             }
           }
         },
@@ -7490,31 +7110,6 @@
         "lodash": {
           "version": "3.10.1"
         },
-        "log4js": {
-          "version": "0.6.38",
-          "dependencies": {
-            "readable-stream": {
-              "version": "1.0.34",
-              "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.2"
-                },
-                "isarray": {
-                  "version": "0.0.1"
-                },
-                "string_decoder": {
-                  "version": "0.10.31"
-                },
-                "inherits": {
-                  "version": "2.0.1"
-                }
-              }
-            },
-            "semver": {
-              "version": "4.3.6"
-            }
-          }
-        },
         "mime": {
           "version": "1.3.4"
         },
@@ -8379,6 +7974,31 @@
     "lodash": {
       "version": "2.4.2"
     },
+    "log4js": {
+      "version": "0.6.38",
+      "dependencies": {
+        "readable-stream": {
+          "version": "1.0.34",
+          "dependencies": {
+            "core-util-is": {
+              "version": "1.0.2"
+            },
+            "isarray": {
+              "version": "0.0.1"
+            },
+            "string_decoder": {
+              "version": "0.10.31"
+            },
+            "inherits": {
+              "version": "2.0.1"
+            }
+          }
+        },
+        "semver": {
+          "version": "4.3.6"
+        }
+      }
+    },
     "marked": {
       "version": "0.3.5"
     },
@@ -8482,20 +8102,8 @@
       }
     },
     "protractor": {
-      "version": "4.0.10",
+      "version": "4.0.2",
       "dependencies": {
-        "@types/jasmine": {
-          "version": "2.5.38"
-        },
-        "@types/node": {
-          "version": "6.0.49"
-        },
-        "@types/q": {
-          "version": "0.0.32"
-        },
-        "@types/selenium-webdriver": {
-          "version": "2.53.35"
-        },
         "adm-zip": {
           "version": "0.4.7"
         },
@@ -8530,13 +8138,13 @@
           }
         },
         "glob": {
-          "version": "7.1.1",
+          "version": "7.0.5",
           "dependencies": {
             "fs.realpath": {
               "version": "1.0.0"
             },
             "inflight": {
-              "version": "1.0.6",
+              "version": "1.0.5",
               "dependencies": {
                 "wrappy": {
                   "version": "1.0.2"
@@ -8544,10 +8152,10 @@
               }
             },
             "inherits": {
-              "version": "2.0.3"
+              "version": "2.0.1"
             },
             "minimatch": {
-              "version": "3.0.3",
+              "version": "3.0.2",
               "dependencies": {
                 "brace-expansion": {
                   "version": "1.1.6",
@@ -8563,7 +8171,7 @@
               }
             },
             "once": {
-              "version": "1.4.0",
+              "version": "1.3.3",
               "dependencies": {
                 "wrappy": {
                   "version": "1.0.2"
@@ -8571,23 +8179,39 @@
               }
             },
             "path-is-absolute": {
-              "version": "1.0.1"
+              "version": "1.0.0"
             }
           }
         },
         "jasmine": {
-          "version": "2.5.2",
+          "version": "2.4.1",
           "dependencies": {
             "exit": {
               "version": "0.1.2"
             },
-            "jasmine-core": {
-              "version": "2.5.2"
+            "glob": {
+              "version": "3.2.11",
+              "dependencies": {
+                "inherits": {
+                  "version": "2.0.1"
+                },
+                "minimatch": {
+                  "version": "0.3.0",
+                  "dependencies": {
+                    "lru-cache": {
+                      "version": "2.7.3"
+                    },
+                    "sigmund": {
+                      "version": "1.0.1"
+                    }
+                  }
+                }
+              }
             }
           }
         },
         "jasminewd2": {
-          "version": "0.0.10"
+          "version": "0.0.9"
         },
         "optimist": {
           "version": "0.6.1",
@@ -8604,7 +8228,7 @@
           "version": "1.4.1"
         },
         "saucelabs": {
-          "version": "1.3.0",
+          "version": "1.2.0",
           "dependencies": {
             "https-proxy-agent": {
               "version": "1.0.0",
@@ -8618,10 +8242,10 @@
                   }
                 },
                 "debug": {
-                  "version": "2.3.3",
+                  "version": "2.2.0",
                   "dependencies": {
                     "ms": {
-                      "version": "0.7.2"
+                      "version": "0.7.1"
                     }
                   }
                 },
@@ -8632,55 +8256,24 @@
             }
           }
         },
-        "selenium-webdriver": {
-          "version": "2.53.3",
-          "dependencies": {
-            "adm-zip": {
-              "version": "0.4.4"
-            },
-            "rimraf": {
-              "version": "2.5.4"
-            },
-            "tmp": {
-              "version": "0.0.24"
-            },
-            "ws": {
-              "version": "1.1.1",
-              "dependencies": {
-                "options": {
-                  "version": "0.0.6"
-                },
-                "ultron": {
-                  "version": "1.0.2"
-                }
-              }
-            },
-            "xml2js": {
-              "version": "0.4.4",
-              "dependencies": {
-                "sax": {
-                  "version": "0.6.1"
-                },
-                "xmlbuilder": {
-                  "version": "8.2.2"
-                }
-              }
-            }
-          }
-        },
         "source-map-support": {
-          "version": "0.4.6",
+          "version": "0.4.2",
           "dependencies": {
             "source-map": {
-              "version": "0.5.6"
+              "version": "0.1.32",
+              "dependencies": {
+                "amdefine": {
+                  "version": "1.0.0"
+                }
+              }
             }
           }
         },
         "webdriver-manager": {
-          "version": "10.2.8",
+          "version": "10.2.1",
           "dependencies": {
             "del": {
-              "version": "2.2.2",
+              "version": "2.2.1",
               "dependencies": {
                 "globby": {
                   "version": "5.0.0",
@@ -8708,7 +8301,7 @@
                       "version": "1.0.0",
                       "dependencies": {
                         "path-is-inside": {
-                          "version": "1.0.2"
+                          "version": "1.0.1"
                         }
                       }
                     }
@@ -8737,13 +8330,41 @@
               "version": "1.2.0"
             },
             "request": {
-              "version": "2.79.0",
+              "version": "2.74.0",
               "dependencies": {
                 "aws-sign2": {
                   "version": "0.6.0"
                 },
                 "aws4": {
-                  "version": "1.5.0"
+                  "version": "1.4.1"
+                },
+                "bl": {
+                  "version": "1.1.2",
+                  "dependencies": {
+                    "readable-stream": {
+                      "version": "2.0.6",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.2"
+                        },
+                        "inherits": {
+                          "version": "2.0.1"
+                        },
+                        "isarray": {
+                          "version": "1.0.0"
+                        },
+                        "process-nextick-args": {
+                          "version": "1.0.7"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31"
+                        },
+                        "util-deprecate": {
+                          "version": "1.0.2"
+                        }
+                      }
+                    }
+                  }
                 },
                 "caseless": {
                   "version": "0.11.0"
@@ -8763,10 +8384,10 @@
                   "version": "0.6.1"
                 },
                 "form-data": {
-                  "version": "2.1.2",
+                  "version": "1.0.0-rc4",
                   "dependencies": {
-                    "asynckit": {
-                      "version": "0.4.0"
+                    "async": {
+                      "version": "1.5.2"
                     }
                   }
                 },
@@ -8782,7 +8403,7 @@
                       }
                     },
                     "is-my-json-valid": {
-                      "version": "2.15.0",
+                      "version": "2.13.1",
                       "dependencies": {
                         "generate-function": {
                           "version": "2.0.0"
@@ -8796,7 +8417,7 @@
                           }
                         },
                         "jsonpointer": {
-                          "version": "4.0.0"
+                          "version": "2.0.0"
                         },
                         "xtend": {
                           "version": "4.0.1"
@@ -8837,13 +8458,13 @@
                       "version": "0.2.0"
                     },
                     "jsprim": {
-                      "version": "1.3.1",
+                      "version": "1.3.0",
                       "dependencies": {
                         "extsprintf": {
                           "version": "1.0.2"
                         },
                         "json-schema": {
-                          "version": "0.2.3"
+                          "version": "0.2.2"
                         },
                         "verror": {
                           "version": "1.3.6"
@@ -8851,7 +8472,7 @@
                       }
                     },
                     "sshpk": {
-                      "version": "1.10.1",
+                      "version": "1.9.2",
                       "dependencies": {
                         "asn1": {
                           "version": "0.2.3"
@@ -8869,16 +8490,13 @@
                           "version": "0.1.0"
                         },
                         "tweetnacl": {
-                          "version": "0.14.3"
+                          "version": "0.13.3"
                         },
                         "jodid25519": {
                           "version": "1.0.2"
                         },
                         "ecc-jsbn": {
                           "version": "0.1.1"
-                        },
-                        "bcrypt-pbkdf": {
-                          "version": "1.0.0"
                         }
                       }
                     }
@@ -8894,43 +8512,35 @@
                   "version": "5.0.1"
                 },
                 "mime-types": {
-                  "version": "2.1.13",
+                  "version": "2.1.11",
                   "dependencies": {
                     "mime-db": {
-                      "version": "1.25.0"
+                      "version": "1.23.0"
                     }
                   }
                 },
+                "node-uuid": {
+                  "version": "1.4.7"
+                },
                 "oauth-sign": {
                   "version": "0.8.2"
                 },
                 "qs": {
-                  "version": "6.3.0"
+                  "version": "6.2.1"
                 },
                 "stringstream": {
                   "version": "0.0.5"
                 },
                 "tough-cookie": {
-                  "version": "2.3.2",
-                  "dependencies": {
-                    "punycode": {
-                      "version": "1.4.1"
-                    }
-                  }
+                  "version": "2.3.1"
                 },
                 "tunnel-agent": {
                   "version": "0.4.3"
-                },
-                "uuid": {
-                  "version": "3.0.0"
                 }
               }
             },
             "rimraf": {
               "version": "2.5.4"
-            },
-            "semver": {
-              "version": "5.3.0"
             }
           }
         }
@@ -8978,6 +8588,90 @@
     "sax": {
       "version": "1.2.1"
     },
+    "selenium-webdriver": {
+      "version": "2.53.3",
+      "dependencies": {
+        "adm-zip": {
+          "version": "0.4.4"
+        },
+        "rimraf": {
+          "version": "2.5.4",
+          "dependencies": {
+            "glob": {
+              "version": "7.0.6",
+              "dependencies": {
+                "fs.realpath": {
+                  "version": "1.0.0"
+                },
+                "inflight": {
+                  "version": "1.0.5",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.2"
+                    }
+                  }
+                },
+                "inherits": {
+                  "version": "2.0.1"
+                },
+                "minimatch": {
+                  "version": "3.0.3",
+                  "dependencies": {
+                    "brace-expansion": {
+                      "version": "1.1.6",
+                      "dependencies": {
+                        "balanced-match": {
+                          "version": "0.4.2"
+                        },
+                        "concat-map": {
+                          "version": "0.0.1"
+                        }
+                      }
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.3",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.2"
+                    }
+                  }
+                },
+                "path-is-absolute": {
+                  "version": "1.0.0"
+                }
+              }
+            }
+          }
+        },
+        "tmp": {
+          "version": "0.0.24"
+        },
+        "ws": {
+          "version": "1.1.1",
+          "dependencies": {
+            "options": {
+              "version": "0.0.6"
+            },
+            "ultron": {
+              "version": "1.0.2"
+            }
+          }
+        },
+        "xml2js": {
+          "version": "0.4.4",
+          "dependencies": {
+            "sax": {
+              "version": "0.6.1"
+            },
+            "xmlbuilder": {
+              "version": "8.2.2"
+            }
+          }
+        }
+      }
+    },
     "semver": {
       "version": "4.0.3"
     },
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 12e10dd9d..e38df81b7 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -4519,18 +4519,6 @@
                   "version": "0.1.6",
                   "from": "https://registry.npmjs.org/async-each/-/async-each-0.1.6.tgz",
                   "resolved": "https://registry.npmjs.org/async-each/-/async-each-0.1.6.tgz"
-                },
-                "fsevents": {
-                  "version": "0.3.8",
-                  "from": "https://registry.npmjs.org/fsevents/-/fsevents-0.3.8.tgz",
-                  "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-0.3.8.tgz",
-                  "dependencies": {
-                    "nan": {
-                      "version": "2.4.0",
-                      "from": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz",
-                      "resolved": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz"
-                    }
-                  }
                 }
               }
             }
@@ -10698,618 +10686,6 @@
                   "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz"
                 }
               }
-            },
-            "fsevents": {
-              "version": "1.0.14",
-              "from": "https://registry.npmjs.org/fsevents/-/fsevents-1.0.14.tgz",
-              "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.0.14.tgz",
-              "dependencies": {
-                "nan": {
-                  "version": "2.4.0",
-                  "from": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz",
-                  "resolved": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz"
-                },
-                "node-pre-gyp": {
-                  "version": "0.6.29",
-                  "from": "node-pre-gyp@>=0.6.29 <0.7.0",
-                  "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.29.tgz"
-                },
-                "abbrev": {
-                  "version": "1.0.9",
-                  "from": "abbrev@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz"
-                },
-                "ansi-regex": {
-                  "version": "2.0.0",
-                  "from": "ansi-regex@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-                },
-                "ansi-styles": {
-                  "version": "2.2.1",
-                  "from": "ansi-styles@>=2.2.1 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"
-                },
-                "aproba": {
-                  "version": "1.0.4",
-                  "from": "aproba@>=1.0.3 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz"
-                },
-                "are-we-there-yet": {
-                  "version": "1.1.2",
-                  "from": "are-we-there-yet@>=1.1.2 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz"
-                },
-                "asn1": {
-                  "version": "0.2.3",
-                  "from": "asn1@>=0.2.3 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
-                },
-                "assert-plus": {
-                  "version": "0.2.0",
-                  "from": "assert-plus@>=0.2.0 <0.3.0",
-                  "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
-                },
-                "async": {
-                  "version": "1.5.2",
-                  "from": "async@>=1.5.2 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
-                },
-                "aws-sign2": {
-                  "version": "0.6.0",
-                  "from": "aws-sign2@>=0.6.0 <0.7.0",
-                  "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
-                },
-                "aws4": {
-                  "version": "1.4.1",
-                  "from": "aws4@>=1.2.1 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz"
-                },
-                "balanced-match": {
-                  "version": "0.4.2",
-                  "from": "balanced-match@>=0.4.1 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"
-                },
-                "block-stream": {
-                  "version": "0.0.9",
-                  "from": "block-stream@*",
-                  "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"
-                },
-                "boom": {
-                  "version": "2.10.1",
-                  "from": "boom@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
-                },
-                "brace-expansion": {
-                  "version": "1.1.5",
-                  "from": "brace-expansion@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.5.tgz"
-                },
-                "buffer-shims": {
-                  "version": "1.0.0",
-                  "from": "buffer-shims@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"
-                },
-                "caseless": {
-                  "version": "0.11.0",
-                  "from": "caseless@>=0.11.0 <0.12.0",
-                  "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
-                },
-                "code-point-at": {
-                  "version": "1.0.0",
-                  "from": "code-point-at@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz"
-                },
-                "chalk": {
-                  "version": "1.1.3",
-                  "from": "chalk@>=1.1.1 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"
-                },
-                "combined-stream": {
-                  "version": "1.0.5",
-                  "from": "combined-stream@>=1.0.5 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"
-                },
-                "commander": {
-                  "version": "2.9.0",
-                  "from": "commander@>=2.9.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
-                },
-                "concat-map": {
-                  "version": "0.0.1",
-                  "from": "concat-map@0.0.1",
-                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                },
-                "console-control-strings": {
-                  "version": "1.1.0",
-                  "from": "console-control-strings@>=1.1.0 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"
-                },
-                "core-util-is": {
-                  "version": "1.0.2",
-                  "from": "core-util-is@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                },
-                "cryptiles": {
-                  "version": "2.0.5",
-                  "from": "cryptiles@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
-                },
-                "debug": {
-                  "version": "2.2.0",
-                  "from": "debug@>=2.2.0 <2.3.0",
-                  "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
-                },
-                "deep-extend": {
-                  "version": "0.4.1",
-                  "from": "deep-extend@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz"
-                },
-                "delayed-stream": {
-                  "version": "1.0.0",
-                  "from": "delayed-stream@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
-                },
-                "delegates": {
-                  "version": "1.0.0",
-                  "from": "delegates@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"
-                },
-                "ecc-jsbn": {
-                  "version": "0.1.1",
-                  "from": "ecc-jsbn@>=0.1.1 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
-                },
-                "escape-string-regexp": {
-                  "version": "1.0.5",
-                  "from": "escape-string-regexp@>=1.0.2 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
-                },
-                "extend": {
-                  "version": "3.0.0",
-                  "from": "extend@>=3.0.0 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
-                },
-                "extsprintf": {
-                  "version": "1.0.2",
-                  "from": "extsprintf@1.0.2",
-                  "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
-                },
-                "forever-agent": {
-                  "version": "0.6.1",
-                  "from": "forever-agent@>=0.6.1 <0.7.0",
-                  "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
-                },
-                "form-data": {
-                  "version": "1.0.0-rc4",
-                  "from": "form-data@>=1.0.0-rc4 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz"
-                },
-                "fs.realpath": {
-                  "version": "1.0.0",
-                  "from": "fs.realpath@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
-                },
-                "fstream": {
-                  "version": "1.0.10",
-                  "from": "fstream@>=1.0.2 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz"
-                },
-                "fstream-ignore": {
-                  "version": "1.0.5",
-                  "from": "fstream-ignore@>=1.0.5 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz"
-                },
-                "gauge": {
-                  "version": "2.6.0",
-                  "from": "gauge@>=2.6.0 <2.7.0",
-                  "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz"
-                },
-                "generate-function": {
-                  "version": "2.0.0",
-                  "from": "generate-function@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
-                },
-                "generate-object-property": {
-                  "version": "1.2.0",
-                  "from": "generate-object-property@>=1.1.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"
-                },
-                "glob": {
-                  "version": "7.0.5",
-                  "from": "glob@>=7.0.5 <8.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz"
-                },
-                "graceful-fs": {
-                  "version": "4.1.4",
-                  "from": "graceful-fs@>=4.1.2 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.4.tgz"
-                },
-                "graceful-readlink": {
-                  "version": "1.0.1",
-                  "from": "graceful-readlink@>=1.0.0",
-                  "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
-                },
-                "har-validator": {
-                  "version": "2.0.6",
-                  "from": "har-validator@>=2.0.6 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"
-                },
-                "has-ansi": {
-                  "version": "2.0.0",
-                  "from": "has-ansi@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
-                },
-                "has-color": {
-                  "version": "0.1.7",
-                  "from": "has-color@>=0.1.7 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz"
-                },
-                "has-unicode": {
-                  "version": "2.0.1",
-                  "from": "has-unicode@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"
-                },
-                "hawk": {
-                  "version": "3.1.3",
-                  "from": "hawk@>=3.1.3 <3.2.0",
-                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"
-                },
-                "hoek": {
-                  "version": "2.16.3",
-                  "from": "hoek@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
-                },
-                "http-signature": {
-                  "version": "1.1.1",
-                  "from": "http-signature@>=1.1.0 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"
-                },
-                "inflight": {
-                  "version": "1.0.5",
-                  "from": "inflight@>=1.0.4 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "inherits@>=2.0.1 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "ini": {
-                  "version": "1.3.4",
-                  "from": "ini@>=1.3.0 <1.4.0",
-                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
-                },
-                "is-fullwidth-code-point": {
-                  "version": "1.0.0",
-                  "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"
-                },
-                "is-my-json-valid": {
-                  "version": "2.13.1",
-                  "from": "is-my-json-valid@>=2.12.4 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz"
-                },
-                "is-property": {
-                  "version": "1.0.2",
-                  "from": "is-property@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
-                },
-                "is-typedarray": {
-                  "version": "1.0.0",
-                  "from": "is-typedarray@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
-                },
-                "isarray": {
-                  "version": "1.0.0",
-                  "from": "isarray@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
-                },
-                "isstream": {
-                  "version": "0.1.2",
-                  "from": "isstream@>=0.1.2 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
-                },
-                "jodid25519": {
-                  "version": "1.0.2",
-                  "from": "jodid25519@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
-                },
-                "jsbn": {
-                  "version": "0.1.0",
-                  "from": "jsbn@>=0.1.0 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
-                },
-                "json-schema": {
-                  "version": "0.2.2",
-                  "from": "json-schema@0.2.2",
-                  "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"
-                },
-                "json-stringify-safe": {
-                  "version": "5.0.1",
-                  "from": "json-stringify-safe@>=5.0.1 <5.1.0",
-                  "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-                },
-                "jsonpointer": {
-                  "version": "2.0.0",
-                  "from": "jsonpointer@2.0.0",
-                  "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
-                },
-                "jsprim": {
-                  "version": "1.3.0",
-                  "from": "jsprim@>=1.2.2 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.0.tgz"
-                },
-                "mime-db": {
-                  "version": "1.23.0",
-                  "from": "mime-db@>=1.23.0 <1.24.0",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz"
-                },
-                "mime-types": {
-                  "version": "2.1.11",
-                  "from": "mime-types@>=2.1.7 <2.2.0",
-                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz"
-                },
-                "minimatch": {
-                  "version": "3.0.2",
-                  "from": "minimatch@>=3.0.2 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz"
-                },
-                "minimist": {
-                  "version": "0.0.8",
-                  "from": "minimist@0.0.8",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                },
-                "mkdirp": {
-                  "version": "0.5.1",
-                  "from": "mkdirp@>=0.5.0 <0.6.0",
-                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
-                },
-                "ms": {
-                  "version": "0.7.1",
-                  "from": "ms@0.7.1",
-                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
-                },
-                "node-uuid": {
-                  "version": "1.4.7",
-                  "from": "node-uuid@>=1.4.7 <1.5.0",
-                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
-                },
-                "nopt": {
-                  "version": "3.0.6",
-                  "from": "nopt@>=3.0.1 <3.1.0",
-                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"
-                },
-                "npmlog": {
-                  "version": "3.1.2",
-                  "from": "npmlog@>=3.1.2 <3.2.0",
-                  "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-3.1.2.tgz"
-                },
-                "number-is-nan": {
-                  "version": "1.0.0",
-                  "from": "number-is-nan@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
-                },
-                "oauth-sign": {
-                  "version": "0.8.2",
-                  "from": "oauth-sign@>=0.8.1 <0.9.0",
-                  "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"
-                },
-                "object-assign": {
-                  "version": "4.1.0",
-                  "from": "object-assign@>=4.1.0 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz"
-                },
-                "once": {
-                  "version": "1.3.3",
-                  "from": "once@>=1.3.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz"
-                },
-                "path-is-absolute": {
-                  "version": "1.0.0",
-                  "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-                },
-                "pinkie": {
-                  "version": "2.0.4",
-                  "from": "pinkie@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
-                },
-                "pinkie-promise": {
-                  "version": "2.0.1",
-                  "from": "pinkie-promise@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
-                },
-                "process-nextick-args": {
-                  "version": "1.0.7",
-                  "from": "process-nextick-args@>=1.0.6 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
-                },
-                "qs": {
-                  "version": "6.2.0",
-                  "from": "qs@>=6.2.0 <6.3.0",
-                  "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz"
-                },
-                "readable-stream": {
-                  "version": "2.1.4",
-                  "from": "readable-stream@>=2.0.0 <3.0.0||>=1.1.13 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz"
-                },
-                "request": {
-                  "version": "2.73.0",
-                  "from": "request@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/request/-/request-2.73.0.tgz"
-                },
-                "rimraf": {
-                  "version": "2.5.3",
-                  "from": "rimraf@>=2.5.0 <2.6.0",
-                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.3.tgz"
-                },
-                "set-blocking": {
-                  "version": "2.0.0",
-                  "from": "set-blocking@>=2.0.0 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
-                },
-                "semver": {
-                  "version": "5.2.0",
-                  "from": "semver@>=5.2.0 <5.3.0",
-                  "resolved": "https://registry.npmjs.org/semver/-/semver-5.2.0.tgz"
-                },
-                "signal-exit": {
-                  "version": "3.0.0",
-                  "from": "signal-exit@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.0.tgz"
-                },
-                "sntp": {
-                  "version": "1.0.9",
-                  "from": "sntp@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
-                },
-                "string-width": {
-                  "version": "1.0.1",
-                  "from": "string-width@>=1.0.1 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.1.tgz"
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "string_decoder@>=0.10.0 <0.11.0",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                },
-                "stringstream": {
-                  "version": "0.0.5",
-                  "from": "stringstream@>=0.0.4 <0.1.0",
-                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
-                },
-                "strip-ansi": {
-                  "version": "3.0.1",
-                  "from": "strip-ansi@>=3.0.1 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
-                },
-                "strip-json-comments": {
-                  "version": "1.0.4",
-                  "from": "strip-json-comments@>=1.0.4 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz"
-                },
-                "supports-color": {
-                  "version": "2.0.0",
-                  "from": "supports-color@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
-                },
-                "tar": {
-                  "version": "2.2.1",
-                  "from": "tar@>=2.2.0 <2.3.0",
-                  "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"
-                },
-                "tar-pack": {
-                  "version": "3.1.4",
-                  "from": "tar-pack@>=3.1.0 <3.2.0",
-                  "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.1.4.tgz"
-                },
-                "tough-cookie": {
-                  "version": "2.2.2",
-                  "from": "tough-cookie@>=2.2.0 <2.3.0",
-                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"
-                },
-                "tunnel-agent": {
-                  "version": "0.4.3",
-                  "from": "tunnel-agent@>=0.4.1 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"
-                },
-                "tweetnacl": {
-                  "version": "0.13.3",
-                  "from": "tweetnacl@>=0.13.0 <0.14.0",
-                  "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz"
-                },
-                "uid-number": {
-                  "version": "0.0.6",
-                  "from": "uid-number@>=0.0.6 <0.1.0",
-                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"
-                },
-                "util-deprecate": {
-                  "version": "1.0.2",
-                  "from": "util-deprecate@>=1.0.1 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                },
-                "verror": {
-                  "version": "1.3.6",
-                  "from": "verror@1.3.6",
-                  "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
-                },
-                "wide-align": {
-                  "version": "1.1.0",
-                  "from": "wide-align@>=1.1.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.0.tgz"
-                },
-                "wrappy": {
-                  "version": "1.0.2",
-                  "from": "wrappy@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
-                },
-                "xtend": {
-                  "version": "4.0.1",
-                  "from": "xtend@>=4.0.0 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-                },
-                "bl": {
-                  "version": "1.1.2",
-                  "from": "bl@>=1.1.2 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
-                  "dependencies": {
-                    "readable-stream": {
-                      "version": "2.0.6",
-                      "from": "readable-stream@>=2.0.5 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
-                    }
-                  }
-                },
-                "dashdash": {
-                  "version": "1.14.0",
-                  "from": "dashdash@>=1.12.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz",
-                  "dependencies": {
-                    "assert-plus": {
-                      "version": "1.0.0",
-                      "from": "assert-plus@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
-                    }
-                  }
-                },
-                "getpass": {
-                  "version": "0.1.6",
-                  "from": "getpass@>=0.1.1 <0.2.0",
-                  "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz",
-                  "dependencies": {
-                    "assert-plus": {
-                      "version": "1.0.0",
-                      "from": "assert-plus@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
-                    }
-                  }
-                },
-                "rc": {
-                  "version": "1.1.6",
-                  "from": "rc@>=1.1.0 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz",
-                  "dependencies": {
-                    "minimist": {
-                      "version": "1.2.0",
-                      "from": "minimist@>=1.2.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
-                    }
-                  }
-                },
-                "sshpk": {
-                  "version": "1.8.3",
-                  "from": "sshpk@>=1.7.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.3.tgz",
-                  "dependencies": {
-                    "assert-plus": {
-                      "version": "1.0.0",
-                      "from": "assert-plus@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
-                    }
-                  }
-                }
-              }
             }
           }
         },
@@ -11544,45 +10920,6 @@
           "from": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
         },
-        "log4js": {
-          "version": "0.6.38",
-          "from": "https://registry.npmjs.com/log4js/-/log4js-0.6.38.tgz",
-          "resolved": "https://registry.npmjs.com/log4js/-/log4js-0.6.38.tgz",
-          "dependencies": {
-            "readable-stream": {
-              "version": "1.0.34",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-              "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.2",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                },
-                "isarray": {
-                  "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                }
-              }
-            },
-            "semver": {
-              "version": "4.3.6",
-              "from": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
-            }
-          }
-        },
         "mime": {
           "version": "1.3.4",
           "from": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz",
@@ -12907,6 +12244,45 @@
       "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
     },
+    "log4js": {
+      "version": "0.6.38",
+      "from": "log4js@>=0.6.27 <0.7.0",
+      "resolved": "https://registry.npmjs.com/log4js/-/log4js-0.6.38.tgz",
+      "dependencies": {
+        "readable-stream": {
+          "version": "1.0.34",
+          "from": "readable-stream@>=1.0.2 <1.1.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "dependencies": {
+            "core-util-is": {
+              "version": "1.0.2",
+              "from": "core-util-is@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+            },
+            "isarray": {
+              "version": "0.0.1",
+              "from": "isarray@0.0.1",
+              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+            },
+            "string_decoder": {
+              "version": "0.10.31",
+              "from": "string_decoder@>=0.10.0 <0.11.0",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+            },
+            "inherits": {
+              "version": "2.0.1",
+              "from": "inherits@>=2.0.1 <2.1.0",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+            }
+          }
+        },
+        "semver": {
+          "version": "4.3.6",
+          "from": "semver@>=4.3.3 <4.4.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
+        }
+      }
+    },
     "marked": {
       "version": "0.3.5",
       "from": "https://registry.npmjs.org/marked/-/marked-0.3.5.tgz",
@@ -13066,126 +12442,106 @@
       }
     },
     "protractor": {
-      "version": "4.0.10",
-      "from": "protractor@4.0.10",
-      "resolved": "https://registry.npmjs.org/protractor/-/protractor-4.0.10.tgz",
+      "version": "4.0.2",
+      "from": "https://registry.npmjs.org/protractor/-/protractor-4.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/protractor/-/protractor-4.0.2.tgz",
       "dependencies": {
-        "@types/jasmine": {
-          "version": "2.5.38",
-          "from": "@types/jasmine@>=2.5.36 <3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.5.38.tgz"
-        },
-        "@types/node": {
-          "version": "6.0.49",
-          "from": "@types/node@>=6.0.46 <7.0.0",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.49.tgz"
-        },
-        "@types/q": {
-          "version": "0.0.32",
-          "from": "@types/q@>=0.0.32 <0.0.33",
-          "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz"
-        },
-        "@types/selenium-webdriver": {
-          "version": "2.53.35",
-          "from": "@types/selenium-webdriver@>=2.53.31 <2.54.0",
-          "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-2.53.35.tgz"
-        },
         "adm-zip": {
           "version": "0.4.7",
-          "from": "adm-zip@0.4.7",
+          "from": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz",
           "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz"
         },
         "chalk": {
           "version": "1.1.3",
-          "from": "chalk@>=1.1.3 <2.0.0",
+          "from": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "dependencies": {
             "ansi-styles": {
               "version": "2.2.1",
-              "from": "ansi-styles@>=2.2.1 <3.0.0",
+              "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
               "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"
             },
             "escape-string-regexp": {
               "version": "1.0.5",
-              "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+              "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
               "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
             },
             "has-ansi": {
               "version": "2.0.0",
-              "from": "has-ansi@>=2.0.0 <3.0.0",
+              "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
               "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "2.0.0",
-                  "from": "ansi-regex@>=2.0.0 <3.0.0",
+                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
                 }
               }
             },
             "strip-ansi": {
               "version": "3.0.1",
-              "from": "strip-ansi@>=3.0.0 <4.0.0",
+              "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
               "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
               "dependencies": {
                 "ansi-regex": {
                   "version": "2.0.0",
-                  "from": "ansi-regex@>=2.0.0 <3.0.0",
+                  "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
                 }
               }
             },
             "supports-color": {
               "version": "2.0.0",
-              "from": "supports-color@>=2.0.0 <3.0.0",
+              "from": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
               "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
             }
           }
         },
         "glob": {
-          "version": "7.1.1",
-          "from": "glob@>=7.0.3 <8.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
+          "version": "7.0.5",
+          "from": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz",
           "dependencies": {
             "fs.realpath": {
               "version": "1.0.0",
-              "from": "fs.realpath@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
             },
             "inflight": {
-              "version": "1.0.6",
-              "from": "inflight@>=1.0.4 <2.0.0",
-              "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+              "version": "1.0.5",
+              "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz",
+              "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz",
               "dependencies": {
                 "wrappy": {
                   "version": "1.0.2",
-                  "from": "wrappy@>=1.0.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
                   "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
                 }
               }
             },
             "inherits": {
-              "version": "2.0.3",
-              "from": "inherits@>=2.0.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
+              "version": "2.0.1",
+              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "minimatch": {
-              "version": "3.0.3",
-              "from": "minimatch@>=3.0.2 <4.0.0",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz",
+              "version": "3.0.2",
+              "from": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz",
               "dependencies": {
                 "brace-expansion": {
                   "version": "1.1.6",
-                  "from": "brace-expansion@>=1.0.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz",
                   "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz",
                   "dependencies": {
                     "balanced-match": {
                       "version": "0.4.2",
-                      "from": "balanced-match@>=0.4.1 <0.5.0",
+                      "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
                       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"
                     },
                     "concat-map": {
                       "version": "0.0.1",
-                      "from": "concat-map@0.0.1",
+                      "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
                     }
                   }
@@ -13193,232 +12549,207 @@
               }
             },
             "once": {
-              "version": "1.4.0",
-              "from": "once@>=1.3.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+              "version": "1.3.3",
+              "from": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+              "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
               "dependencies": {
                 "wrappy": {
                   "version": "1.0.2",
-                  "from": "wrappy@>=1.0.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
                   "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
                 }
               }
             },
             "path-is-absolute": {
-              "version": "1.0.1",
-              "from": "path-is-absolute@>=1.0.0 <2.0.0",
-              "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
+              "version": "1.0.0",
+              "from": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz",
+              "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
             }
           }
         },
         "jasmine": {
-          "version": "2.5.2",
-          "from": "jasmine@2.5.2",
-          "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.5.2.tgz",
+          "version": "2.4.1",
+          "from": "https://registry.npmjs.org/jasmine/-/jasmine-2.4.1.tgz",
+          "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.4.1.tgz",
           "dependencies": {
             "exit": {
               "version": "0.1.2",
-              "from": "exit@>=0.1.2 <0.2.0",
+              "from": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
               "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"
             },
-            "jasmine-core": {
-              "version": "2.5.2",
-              "from": "jasmine-core@>=2.5.2 <2.6.0",
-              "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.5.2.tgz"
+            "glob": {
+              "version": "3.2.11",
+              "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+              "dependencies": {
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "minimatch": {
+                  "version": "0.3.0",
+                  "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+                  "dependencies": {
+                    "lru-cache": {
+                      "version": "2.7.3",
+                      "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
+                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+                    },
+                    "sigmund": {
+                      "version": "1.0.1",
+                      "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
+                    }
+                  }
+                }
+              }
             }
           }
         },
         "jasminewd2": {
-          "version": "0.0.10",
-          "from": "jasminewd2@0.0.10",
-          "resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-0.0.10.tgz"
+          "version": "0.0.9",
+          "from": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-0.0.9.tgz",
+          "resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-0.0.9.tgz"
         },
         "optimist": {
           "version": "0.6.1",
-          "from": "optimist@>=0.6.0 <0.7.0",
+          "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
           "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
           "dependencies": {
             "wordwrap": {
               "version": "0.0.3",
-              "from": "wordwrap@>=0.0.2 <0.1.0",
+              "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
               "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
             },
             "minimist": {
               "version": "0.0.10",
-              "from": "minimist@>=0.0.1 <0.1.0",
+              "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
             }
           }
         },
         "q": {
           "version": "1.4.1",
-          "from": "q@1.4.1",
+          "from": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
           "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz"
         },
         "saucelabs": {
-          "version": "1.3.0",
-          "from": "saucelabs@>=1.3.0 <1.4.0",
-          "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.3.0.tgz",
+          "version": "1.2.0",
+          "from": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.2.0.tgz",
           "dependencies": {
             "https-proxy-agent": {
               "version": "1.0.0",
-              "from": "https-proxy-agent@>=1.0.0 <2.0.0",
+              "from": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz",
               "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz",
               "dependencies": {
                 "agent-base": {
                   "version": "2.0.1",
-                  "from": "agent-base@>=2.0.0 <3.0.0",
+                  "from": "https://registry.npmjs.org/agent-base/-/agent-base-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.0.1.tgz",
                   "dependencies": {
                     "semver": {
                       "version": "5.0.3",
-                      "from": "semver@>=5.0.1 <5.1.0",
+                      "from": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz",
                       "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"
                     }
                   }
                 },
                 "debug": {
-                  "version": "2.3.3",
-                  "from": "debug@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
+                  "version": "2.2.0",
+                  "from": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+                  "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
                   "dependencies": {
                     "ms": {
-                      "version": "0.7.2",
-                      "from": "ms@0.7.2",
-                      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"
+                      "version": "0.7.1",
+                      "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+                      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
                     }
                   }
                 },
                 "extend": {
                   "version": "3.0.0",
-                  "from": "extend@>=3.0.0 <4.0.0",
+                  "from": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
                 }
               }
             }
           }
         },
-        "selenium-webdriver": {
-          "version": "2.53.3",
-          "from": "selenium-webdriver@2.53.3",
-          "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.53.3.tgz",
-          "dependencies": {
-            "adm-zip": {
-              "version": "0.4.4",
-              "from": "adm-zip@0.4.4",
-              "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz"
-            },
-            "rimraf": {
-              "version": "2.5.4",
-              "from": "rimraf@>=2.2.8 <3.0.0",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz"
-            },
-            "tmp": {
-              "version": "0.0.24",
-              "from": "tmp@0.0.24",
-              "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.24.tgz"
-            },
-            "ws": {
-              "version": "1.1.1",
-              "from": "ws@>=1.0.1 <2.0.0",
-              "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz",
-              "dependencies": {
-                "options": {
-                  "version": "0.0.6",
-                  "from": "options@>=0.0.5",
-                  "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz"
-                },
-                "ultron": {
-                  "version": "1.0.2",
-                  "from": "ultron@>=1.0.0 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz"
-                }
-              }
-            },
-            "xml2js": {
-              "version": "0.4.4",
-              "from": "xml2js@0.4.4",
-              "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
-              "dependencies": {
-                "sax": {
-                  "version": "0.6.1",
-                  "from": "sax@>=0.6.0 <0.7.0",
-                  "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
-                },
-                "xmlbuilder": {
-                  "version": "8.2.2",
-                  "from": "xmlbuilder@>=1.0.0",
-                  "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz"
-                }
-              }
-            }
-          }
-        },
         "source-map-support": {
-          "version": "0.4.6",
-          "from": "source-map-support@>=0.4.0 <0.5.0",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.6.tgz",
+          "version": "0.4.2",
+          "from": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.2.tgz",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.2.tgz",
           "dependencies": {
             "source-map": {
-              "version": "0.5.6",
-              "from": "source-map@>=0.5.3 <0.6.0",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
+              "version": "0.1.32",
+              "from": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz",
+              "dependencies": {
+                "amdefine": {
+                  "version": "1.0.0",
+                  "from": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
+                }
+              }
             }
           }
         },
         "webdriver-manager": {
-          "version": "10.2.8",
-          "from": "webdriver-manager@>=10.2.6 <11.0.0",
-          "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-10.2.8.tgz",
+          "version": "10.2.1",
+          "from": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-10.2.1.tgz",
+          "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-10.2.1.tgz",
           "dependencies": {
             "del": {
-              "version": "2.2.2",
-              "from": "del@>=2.2.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
+              "version": "2.2.1",
+              "from": "https://registry.npmjs.org/del/-/del-2.2.1.tgz",
+              "resolved": "https://registry.npmjs.org/del/-/del-2.2.1.tgz",
               "dependencies": {
                 "globby": {
                   "version": "5.0.0",
-                  "from": "globby@>=5.0.0 <6.0.0",
+                  "from": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
                   "dependencies": {
                     "array-union": {
                       "version": "1.0.2",
-                      "from": "array-union@>=1.0.1 <2.0.0",
+                      "from": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
                       "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
                       "dependencies": {
                         "array-uniq": {
                           "version": "1.0.3",
-                          "from": "array-uniq@>=1.0.1 <2.0.0",
+                          "from": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
                           "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"
                         }
                       }
                     },
                     "arrify": {
                       "version": "1.0.1",
-                      "from": "arrify@>=1.0.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"
                     }
                   }
                 },
                 "is-path-cwd": {
                   "version": "1.0.0",
-                  "from": "is-path-cwd@>=1.0.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz"
                 },
                 "is-path-in-cwd": {
                   "version": "1.0.0",
-                  "from": "is-path-in-cwd@>=1.0.0 <2.0.0",
+                  "from": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
                   "dependencies": {
                     "is-path-inside": {
                       "version": "1.0.0",
-                      "from": "is-path-inside@>=1.0.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz",
                       "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz",
                       "dependencies": {
                         "path-is-inside": {
-                          "version": "1.0.2",
-                          "from": "path-is-inside@>=1.0.1 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"
+                          "version": "1.0.1",
+                          "from": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz"
                         }
                       }
                     }
@@ -13426,22 +12757,22 @@
                 },
                 "object-assign": {
                   "version": "4.1.0",
-                  "from": "object-assign@>=4.0.1 <5.0.0",
+                  "from": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz",
                   "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz"
                 },
                 "pify": {
                   "version": "2.3.0",
-                  "from": "pify@>=2.0.0 <3.0.0",
+                  "from": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
                   "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
                 },
                 "pinkie-promise": {
                   "version": "2.0.1",
-                  "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                  "from": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
                   "dependencies": {
                     "pinkie": {
                       "version": "2.0.4",
-                      "from": "pinkie@>=2.0.0 <3.0.0",
+                      "from": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
                       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
                     }
                   }
@@ -13450,127 +12781,171 @@
             },
             "ini": {
               "version": "1.3.4",
-              "from": "ini@>=1.3.4 <2.0.0",
+              "from": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
               "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
             },
             "minimist": {
               "version": "1.2.0",
-              "from": "minimist@>=1.2.0 <2.0.0",
+              "from": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
             },
             "request": {
-              "version": "2.79.0",
-              "from": "request@>=2.78.0 <3.0.0",
-              "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz",
+              "version": "2.74.0",
+              "from": "https://registry.npmjs.org/request/-/request-2.74.0.tgz",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.74.0.tgz",
               "dependencies": {
                 "aws-sign2": {
                   "version": "0.6.0",
-                  "from": "aws-sign2@>=0.6.0 <0.7.0",
+                  "from": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
                   "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
                 },
                 "aws4": {
-                  "version": "1.5.0",
-                  "from": "aws4@>=1.2.1 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz"
+                  "version": "1.4.1",
+                  "from": "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz",
+                  "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz"
+                },
+                "bl": {
+                  "version": "1.1.2",
+                  "from": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
+                  "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
+                  "dependencies": {
+                    "readable-stream": {
+                      "version": "2.0.6",
+                      "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.2",
+                          "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                        },
+                        "inherits": {
+                          "version": "2.0.1",
+                          "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                        },
+                        "isarray": {
+                          "version": "1.0.0",
+                          "from": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+                        },
+                        "process-nextick-args": {
+                          "version": "1.0.7",
+                          "from": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31",
+                          "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                        },
+                        "util-deprecate": {
+                          "version": "1.0.2",
+                          "from": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+                          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                        }
+                      }
+                    }
+                  }
                 },
                 "caseless": {
                   "version": "0.11.0",
-                  "from": "caseless@>=0.11.0 <0.12.0",
+                  "from": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
                   "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
                 },
                 "combined-stream": {
                   "version": "1.0.5",
-                  "from": "combined-stream@>=1.0.5 <1.1.0",
+                  "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
                   "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
                   "dependencies": {
                     "delayed-stream": {
                       "version": "1.0.0",
-                      "from": "delayed-stream@>=1.0.0 <1.1.0",
+                      "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
                       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
                     }
                   }
                 },
                 "extend": {
                   "version": "3.0.0",
-                  "from": "extend@>=3.0.0 <3.1.0",
+                  "from": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
                 },
                 "forever-agent": {
                   "version": "0.6.1",
-                  "from": "forever-agent@>=0.6.1 <0.7.0",
+                  "from": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
                   "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
                 },
                 "form-data": {
-                  "version": "2.1.2",
-                  "from": "form-data@>=2.1.1 <2.2.0",
-                  "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz",
+                  "version": "1.0.0-rc4",
+                  "from": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz",
+                  "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz",
                   "dependencies": {
-                    "asynckit": {
-                      "version": "0.4.0",
-                      "from": "asynckit@>=0.4.0 <0.5.0",
-                      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
+                    "async": {
+                      "version": "1.5.2",
+                      "from": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+                      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
                     }
                   }
                 },
                 "har-validator": {
                   "version": "2.0.6",
-                  "from": "har-validator@>=2.0.6 <2.1.0",
+                  "from": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
                   "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
                   "dependencies": {
                     "commander": {
                       "version": "2.9.0",
-                      "from": "commander@>=2.9.0 <3.0.0",
+                      "from": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
                       "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
                       "dependencies": {
                         "graceful-readlink": {
                           "version": "1.0.1",
-                          "from": "graceful-readlink@>=1.0.0",
+                          "from": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
                         }
                       }
                     },
                     "is-my-json-valid": {
-                      "version": "2.15.0",
-                      "from": "is-my-json-valid@>=2.12.4 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz",
+                      "version": "2.13.1",
+                      "from": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz",
+                      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz",
                       "dependencies": {
                         "generate-function": {
                           "version": "2.0.0",
-                          "from": "generate-function@>=2.0.0 <3.0.0",
+                          "from": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
                           "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
                         },
                         "generate-object-property": {
                           "version": "1.2.0",
-                          "from": "generate-object-property@>=1.1.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
                           "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
                           "dependencies": {
                             "is-property": {
                               "version": "1.0.2",
-                              "from": "is-property@>=1.0.0 <2.0.0",
+                              "from": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
                               "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
                             }
                           }
                         },
                         "jsonpointer": {
-                          "version": "4.0.0",
-                          "from": "jsonpointer@>=4.0.0 <5.0.0",
-                          "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.0.tgz"
+                          "version": "2.0.0",
+                          "from": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz",
+                          "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
                         },
                         "xtend": {
                           "version": "4.0.1",
-                          "from": "xtend@>=4.0.0 <5.0.0",
+                          "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
                           "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
                         }
                       }
                     },
                     "pinkie-promise": {
                       "version": "2.0.1",
-                      "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                      "from": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
                       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
                       "dependencies": {
                         "pinkie": {
                           "version": "2.0.4",
-                          "from": "pinkie@>=2.0.0 <3.0.0",
+                          "from": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
                           "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
                         }
                       }
@@ -13579,112 +12954,107 @@
                 },
                 "hawk": {
                   "version": "3.1.3",
-                  "from": "hawk@>=3.1.3 <3.2.0",
+                  "from": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
                   "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
                   "dependencies": {
                     "hoek": {
                       "version": "2.16.3",
-                      "from": "hoek@>=2.0.0 <3.0.0",
+                      "from": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
                       "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
                     },
                     "boom": {
                       "version": "2.10.1",
-                      "from": "boom@>=2.0.0 <3.0.0",
+                      "from": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
                       "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
                     },
                     "cryptiles": {
                       "version": "2.0.5",
-                      "from": "cryptiles@>=2.0.0 <3.0.0",
+                      "from": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
                       "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
                     },
                     "sntp": {
                       "version": "1.0.9",
-                      "from": "sntp@>=1.0.0 <2.0.0",
+                      "from": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
                       "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
                     }
                   }
                 },
                 "http-signature": {
                   "version": "1.1.1",
-                  "from": "http-signature@>=1.1.0 <1.2.0",
+                  "from": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
                   "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
                   "dependencies": {
                     "assert-plus": {
                       "version": "0.2.0",
-                      "from": "assert-plus@>=0.2.0 <0.3.0",
+                      "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
                       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
                     },
                     "jsprim": {
-                      "version": "1.3.1",
-                      "from": "jsprim@>=1.2.2 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz",
+                      "version": "1.3.0",
+                      "from": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.0.tgz",
+                      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.0.tgz",
                       "dependencies": {
                         "extsprintf": {
                           "version": "1.0.2",
-                          "from": "extsprintf@1.0.2",
+                          "from": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
                           "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
                         },
                         "json-schema": {
-                          "version": "0.2.3",
-                          "from": "json-schema@0.2.3",
-                          "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"
+                          "version": "0.2.2",
+                          "from": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz",
+                          "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"
                         },
                         "verror": {
                           "version": "1.3.6",
-                          "from": "verror@1.3.6",
+                          "from": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
                           "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
                         }
                       }
                     },
                     "sshpk": {
-                      "version": "1.10.1",
-                      "from": "sshpk@>=1.7.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.10.1.tgz",
+                      "version": "1.9.2",
+                      "from": "https://registry.npmjs.org/sshpk/-/sshpk-1.9.2.tgz",
+                      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.9.2.tgz",
                       "dependencies": {
                         "asn1": {
                           "version": "0.2.3",
-                          "from": "asn1@>=0.2.3 <0.3.0",
+                          "from": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
                           "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
                         },
                         "assert-plus": {
                           "version": "1.0.0",
-                          "from": "assert-plus@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
                           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
                         },
                         "dashdash": {
                           "version": "1.14.0",
-                          "from": "dashdash@>=1.12.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz",
                           "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz"
                         },
                         "getpass": {
                           "version": "0.1.6",
-                          "from": "getpass@>=0.1.1 <0.2.0",
+                          "from": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz",
                           "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz"
                         },
                         "jsbn": {
                           "version": "0.1.0",
-                          "from": "jsbn@>=0.1.0 <0.2.0",
+                          "from": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz",
                           "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
                         },
                         "tweetnacl": {
-                          "version": "0.14.3",
-                          "from": "tweetnacl@>=0.14.0 <0.15.0",
-                          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz"
+                          "version": "0.13.3",
+                          "from": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz",
+                          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz"
                         },
                         "jodid25519": {
                           "version": "1.0.2",
-                          "from": "jodid25519@>=1.0.0 <2.0.0",
+                          "from": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz",
                           "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
                         },
                         "ecc-jsbn": {
                           "version": "0.1.1",
-                          "from": "ecc-jsbn@>=0.1.1 <0.2.0",
+                          "from": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
                           "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
-                        },
-                        "bcrypt-pbkdf": {
-                          "version": "1.0.0",
-                          "from": "bcrypt-pbkdf@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz"
                         }
                       }
                     }
@@ -13692,79 +13062,67 @@
                 },
                 "is-typedarray": {
                   "version": "1.0.0",
-                  "from": "is-typedarray@>=1.0.0 <1.1.0",
+                  "from": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
                   "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
                 },
                 "isstream": {
                   "version": "0.1.2",
-                  "from": "isstream@>=0.1.2 <0.2.0",
+                  "from": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
                   "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
                 },
                 "json-stringify-safe": {
                   "version": "5.0.1",
-                  "from": "json-stringify-safe@>=5.0.1 <5.1.0",
+                  "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
                 },
                 "mime-types": {
-                  "version": "2.1.13",
-                  "from": "mime-types@>=2.1.7 <2.2.0",
-                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz",
+                  "version": "2.1.11",
+                  "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
+                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
                   "dependencies": {
                     "mime-db": {
-                      "version": "1.25.0",
-                      "from": "mime-db@>=1.25.0 <1.26.0",
-                      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz"
+                      "version": "1.23.0",
+                      "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz",
+                      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz"
                     }
                   }
                 },
+                "node-uuid": {
+                  "version": "1.4.7",
+                  "from": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz",
+                  "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
+                },
                 "oauth-sign": {
                   "version": "0.8.2",
-                  "from": "oauth-sign@>=0.8.1 <0.9.0",
+                  "from": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
                   "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"
                 },
                 "qs": {
-                  "version": "6.3.0",
-                  "from": "qs@>=6.3.0 <6.4.0",
-                  "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz"
+                  "version": "6.2.1",
+                  "from": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz",
+                  "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"
                 },
                 "stringstream": {
                   "version": "0.0.5",
-                  "from": "stringstream@>=0.0.4 <0.1.0",
+                  "from": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
                   "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
                 },
                 "tough-cookie": {
-                  "version": "2.3.2",
-                  "from": "tough-cookie@>=2.3.0 <2.4.0",
-                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-                  "dependencies": {
-                    "punycode": {
-                      "version": "1.4.1",
-                      "from": "punycode@>=1.4.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"
-                    }
-                  }
+                  "version": "2.3.1",
+                  "from": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz",
+                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz"
                 },
                 "tunnel-agent": {
                   "version": "0.4.3",
-                  "from": "tunnel-agent@>=0.4.1 <0.5.0",
+                  "from": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
                   "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"
-                },
-                "uuid": {
-                  "version": "3.0.0",
-                  "from": "uuid@>=3.0.0 <4.0.0",
-                  "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz"
                 }
               }
             },
             "rimraf": {
               "version": "2.5.4",
-              "from": "rimraf@>=2.5.2 <3.0.0",
+              "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
               "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz"
-            },
-            "semver": {
-              "version": "5.3.0",
-              "from": "semver@>=5.3.0 <6.0.0",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"
             }
           }
         }
@@ -13836,6 +13194,134 @@
       "from": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"
     },
+    "selenium-webdriver": {
+      "version": "2.53.3",
+      "from": "selenium-webdriver@>=2.53.1 <3.0.0",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.53.3.tgz",
+      "dependencies": {
+        "adm-zip": {
+          "version": "0.4.4",
+          "from": "adm-zip@0.4.4",
+          "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz"
+        },
+        "rimraf": {
+          "version": "2.5.4",
+          "from": "rimraf@>=2.2.8 <3.0.0",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
+          "dependencies": {
+            "glob": {
+              "version": "7.0.6",
+              "from": "glob@>=7.0.5 <8.0.0",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
+              "dependencies": {
+                "fs.realpath": {
+                  "version": "1.0.0",
+                  "from": "fs.realpath@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
+                },
+                "inflight": {
+                  "version": "1.0.5",
+                  "from": "inflight@>=1.0.4 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.2",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+                    }
+                  }
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "inherits@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "minimatch": {
+                  "version": "3.0.3",
+                  "from": "minimatch@>=3.0.2 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz",
+                  "dependencies": {
+                    "brace-expansion": {
+                      "version": "1.1.6",
+                      "from": "brace-expansion@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz",
+                      "dependencies": {
+                        "balanced-match": {
+                          "version": "0.4.2",
+                          "from": "balanced-match@>=0.4.1 <0.5.0",
+                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"
+                        },
+                        "concat-map": {
+                          "version": "0.0.1",
+                          "from": "concat-map@0.0.1",
+                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.3.3",
+                  "from": "once@>=1.3.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.2",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+                    }
+                  }
+                },
+                "path-is-absolute": {
+                  "version": "1.0.0",
+                  "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                }
+              }
+            }
+          }
+        },
+        "tmp": {
+          "version": "0.0.24",
+          "from": "tmp@0.0.24",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.24.tgz"
+        },
+        "ws": {
+          "version": "1.1.1",
+          "from": "ws@>=1.0.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz",
+          "dependencies": {
+            "options": {
+              "version": "0.0.6",
+              "from": "options@>=0.0.5",
+              "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz"
+            },
+            "ultron": {
+              "version": "1.0.2",
+              "from": "ultron@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz"
+            }
+          }
+        },
+        "xml2js": {
+          "version": "0.4.4",
+          "from": "xml2js@0.4.4",
+          "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
+          "dependencies": {
+            "sax": {
+              "version": "0.6.1",
+              "from": "sax@>=0.6.0 <0.7.0",
+              "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
+            },
+            "xmlbuilder": {
+              "version": "8.2.2",
+              "from": "xmlbuilder@>=1.0.0",
+              "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz"
+            }
+          }
+        }
+      }
+    },
     "semver": {
       "version": "4.0.3",
       "from": "https://registry.npmjs.org/semver/-/semver-4.0.3.tgz",
@@ -14053,7 +13539,7 @@
     },
     "shelljs": {
       "version": "0.3.0",
-      "from": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz",
+      "from": "shelljs@0.3.0",
       "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"
     },
     "sorted-object": {
diff --git a/package.json b/package.json
index 1abd62145..4acb4c500 100644
--- a/package.json
+++ b/package.json
@@ -65,6 +65,7 @@
     "karma-script-launcher": "^1.0.0",
     "load-grunt-tasks": "^3.5.0",
     "lodash": "~2.4.1",
+    "log4js": "^0.6.27",
     "marked": "~0.3.0",
     "node-html-encoder": "0.0.2",
     "promises-aplus-tests": "~2.1.0",
@@ -74,6 +75,7 @@
     "qq": "^0.3.5",
     "rewire": "~2.1.0",
     "sax": "^1.1.1",
+    "selenium-webdriver": "^2.53.1",
     "semver": "~4.0.3",
     "serve-favicon": "^2.3.0",
     "serve-index": "^1.8.0",
diff --git a/src/ng/directive/ngCsp.js b/src/ng/directive/ngCsp.js
index a2866dc1e..f0303ef8a 100644
--- a/src/ng/directive/ngCsp.js
+++ b/src/ng/directive/ngCsp.js
@@ -161,7 +161,7 @@
 
           beforeEach(function() {
             util = require('util');
-            webdriver = require('protractor/node_modules/selenium-webdriver');
+            webdriver = require('selenium-webdriver');
           });
 
           // For now, we only test on Chrome,