diff --git a/package-lock.json b/package-lock.json
index 1c4977315..6f7fe34c9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -82,11 +82,6 @@
         "repeat-string": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"
       }
     },
-    "amdefine": {
-      "version": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "dev": true
-    },
     "ansi-colors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.0.1.tgz",
@@ -183,29 +178,6 @@
         }
       }
     },
-    "archiver-utils": {
-      "version": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz",
-      "integrity": "sha1-5QtMCccL89aA4y/xt5lOn52JUXQ=",
-      "dev": true,
-      "requires": {
-        "glob": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
-        "graceful-fs": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-        "lazystream": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-        "lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-        "normalize-path": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz",
-        "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz"
-      },
-      "dependencies": {
-        "lazystream": {
-          "version": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-          "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
-          "dev": true,
-          "requires": {
-            "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz"
-          }
-        }
-      }
-    },
     "archy": {
       "version": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
       "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
@@ -311,11 +283,6 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
       "dev": true
     },
-    "atob": {
-      "version": "https://registry.npmjs.org/atob/-/atob-1.1.3.tgz",
-      "integrity": "sha1-lfE2KbEsOlGl0hWr3OKqnzL4B3M=",
-      "dev": true
-    },
     "attempt-x": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/attempt-x/-/attempt-x-1.1.1.tgz",
@@ -593,14 +560,6 @@
         "resolve": "https://registry.npmjs.org/resolve/-/resolve-1.2.0.tgz"
       }
     },
-    "cli-cursor": {
-      "version": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
-      "dev": true,
-      "requires": {
-        "restore-cursor": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"
-      }
-    },
     "cliui": {
       "version": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
       "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
@@ -1386,40 +1345,6 @@
       "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=",
       "dev": true
     },
-    "css": {
-      "version": "https://registry.npmjs.org/css/-/css-2.2.1.tgz",
-      "integrity": "sha1-c6TIHehdtmTU7mdPfUcIXjstVdw=",
-      "dev": true,
-      "requires": {
-        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-        "source-map": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-        "source-map-resolve": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.3.1.tgz",
-        "urix": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
-          "dev": true,
-          "requires": {
-            "amdefine": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"
-          }
-        }
-      }
-    },
-    "css-parse": {
-      "version": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
-      "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=",
-      "dev": true,
-      "requires": {
-        "css": "https://registry.npmjs.org/css/-/css-2.2.1.tgz"
-      }
-    },
-    "css-value": {
-      "version": "https://registry.npmjs.org/css-value/-/css-value-0.0.1.tgz",
-      "integrity": "sha1-Xv1sLupeof1rasV+wEJ7GEUkJOo=",
-      "dev": true
-    },
     "ctype": {
       "version": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
       "integrity": "sha1-gsGMJGH3QRTvFsE1IkrQuRRMoS8=",
@@ -1798,12 +1723,6 @@
         }
       }
     },
-    "exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-      "dev": true
-    },
     "expand-braces": {
       "version": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz",
       "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=",
@@ -2034,14 +1953,6 @@
         "pend": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"
       }
     },
-    "figures": {
-      "version": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
-      "dev": true,
-      "requires": {
-        "escape-string-regexp": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
-      }
-    },
     "filename-regex": {
       "version": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.0.tgz",
       "integrity": "sha1-mW4+gEebmLmJfxWopYs9CE6SZ3U=",
@@ -3061,6 +2972,12 @@
           "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
           "dev": true
         },
+        "is-promise": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+          "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+          "dev": true
+        },
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -3092,7 +3009,7 @@
             "es5-ext": "0.10.38",
             "es6-weak-map": "2.0.2",
             "event-emitter": "0.3.5",
-            "is-promise": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+            "is-promise": "2.1.0",
             "lru-queue": "0.1.0",
             "next-tick": "1.0.0",
             "timers-ext": "0.1.2"
@@ -3376,17 +3293,16 @@
       "dev": true
     },
     "gulp-rollup": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/gulp-rollup/-/gulp-rollup-2.16.1.tgz",
-      "integrity": "sha512-+dqR148FPh2NGvMw5WlZX5KLYSCczrTwIqOWReARx7uCwcKG9rou1A+6/wwfQj9wSZQGbdVQZBhhzmVYkpPhPQ==",
+      "version": "2.16.2",
+      "resolved": "https://registry.npmjs.org/gulp-rollup/-/gulp-rollup-2.16.2.tgz",
+      "integrity": "sha512-Gs9NYcUl0xXod7qenC1Lm49a/PGllAa5ONyCXu29lXfkP1oJnJzSdPBjopm9RlOVhefadbHlfy9AijovFrqABA==",
       "dev": true,
       "requires": {
         "buffer-from": "0.1.1",
-        "gulp-util": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
-        "plugin-error": "1.0.0",
+        "plugin-error": "1.0.1",
         "readable-stream": "2.3.3",
         "rollup": "0.54.1",
-        "rollup-plugin-hypothetical": "2.0.0",
+        "rollup-plugin-hypothetical": "2.1.0",
         "vinyl": "2.1.0"
       },
       "dependencies": {
@@ -4186,12 +4102,11 @@
       }
     },
     "has-own-property-x": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/has-own-property-x/-/has-own-property-x-3.2.0.tgz",
-      "integrity": "sha512-HtRQTYpRFz/YVaQ7jh2mU5iorMAxFcML9FNOLMI1f8VNJ2K0hpOlXoi1a+nmVl6oUcGnhd6zYOFAVe7NUFStyQ==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/has-own-property-x/-/has-own-property-x-3.1.1.tgz",
+      "integrity": "sha512-1L+yagK0h8YedH/bkwoiY+PdCr6SadmjgMudQ2SjiPdxXGdPhFybpln3yJ41EpuETz33ITNxTMHdYfeM79W03Q==",
       "dev": true,
       "requires": {
-        "cached-constructors-x": "1.0.0",
         "to-object-x": "1.5.0",
         "to-property-key-x": "2.0.2"
       }
@@ -4498,6 +4413,55 @@
           "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
           "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
           "dev": true
+        },
+        "normalize-space-x": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-space-x/-/normalize-space-x-3.0.0.tgz",
+          "integrity": "sha512-tbCJerqZCCHPst4rRKgsTanLf45fjOyeAU5zE3mhDxJtFJKt66q39g2XArWhXelgTFVib8mNBUm6Wrd0LxYcfQ==",
+          "dev": true,
+          "requires": {
+            "cached-constructors-x": "1.0.0",
+            "trim-x": "3.0.0",
+            "white-space-x": "3.0.0"
+          }
+        },
+        "trim-left-x": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/trim-left-x/-/trim-left-x-3.0.0.tgz",
+          "integrity": "sha512-+m6cqkppI+CxQBTwWEZliOHpOBnCArGyMnS1WCLb6IRgukhTkiQu/TNEN5Lj2eM9jk8ewJsc7WxFZfmwNpRXWQ==",
+          "dev": true,
+          "requires": {
+            "cached-constructors-x": "1.0.0",
+            "require-coercible-to-string-x": "1.0.0",
+            "white-space-x": "3.0.0"
+          }
+        },
+        "trim-right-x": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/trim-right-x/-/trim-right-x-3.0.0.tgz",
+          "integrity": "sha512-iIqEsWEbWVodqdixJHi4FoayJkUxhoL4AvSNGp4FF4FfQKRPGizt8++/RnyC9od75y7P/S6EfONoVqP+NddiKA==",
+          "dev": true,
+          "requires": {
+            "cached-constructors-x": "1.0.0",
+            "require-coercible-to-string-x": "1.0.0",
+            "white-space-x": "3.0.0"
+          }
+        },
+        "trim-x": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/trim-x/-/trim-x-3.0.0.tgz",
+          "integrity": "sha512-w8s38RAUScQ6t3XqMkS75iz5ZkIYLQpVnv2lp3IuTS36JdlVzC54oe6okOf4Wz3UH4rr3XAb2xR3kR5Xei82fw==",
+          "dev": true,
+          "requires": {
+            "trim-left-x": "3.0.0",
+            "trim-right-x": "3.0.0"
+          }
+        },
+        "white-space-x": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/white-space-x/-/white-space-x-3.0.0.tgz",
+          "integrity": "sha512-nMPVXGMdi/jQepXKryxqzEh/vCwdOYY/u6NZy40glMHvZfEr7/+vQKnDhEq4rZ1nniOFq9GWohQYB30uW/5Olg==",
+          "dev": true
         }
       }
     },
@@ -4510,16 +4474,16 @@
       }
     },
     "is-index-x": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-index-x/-/is-index-x-1.1.0.tgz",
-      "integrity": "sha512-qULKLMepQLGC8rSVdi8uF2vI4LiDrU9XSDg1D+Aa657GIB7GV1jHpga7uXgQvkt/cpQ5mVBHUFTpSehYSqT6+A==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-index-x/-/is-index-x-1.0.0.tgz",
+      "integrity": "sha512-BJ7vtw0jvcjBX4UsT7KkpZUliAMX3vJugZimDKy4W6ilGDtvUZ8nYsYnROVrrsjNjg5LJ3MN9NvyRVALfDW/wQ==",
       "dev": true,
       "requires": {
-        "math-clamp-x": "1.2.0",
+        "math-clamp-x": "1.1.0",
         "max-safe-integer": "1.0.1",
-        "to-integer-x": "3.0.0",
-        "to-number-x": "2.0.0",
-        "to-string-symbols-supported-x": "1.0.0"
+        "safe-to-string-x": "2.0.3",
+        "to-integer-x": "2.1.0",
+        "to-number-x": "1.2.0"
       }
     },
     "is-installed-globally": {
@@ -4574,6 +4538,20 @@
       "requires": {
         "lodash.isnull": "3.0.0",
         "validate.io-undefined": "1.0.3"
+      },
+      "dependencies": {
+        "lodash.isnull": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/lodash.isnull/-/lodash.isnull-3.0.0.tgz",
+          "integrity": "sha1-+vvlnqHcon7teGU0A53YTC4HxW4=",
+          "dev": true
+        },
+        "validate.io-undefined": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/validate.io-undefined/-/validate.io-undefined-1.0.3.tgz",
+          "integrity": "sha1-fif8uzFbhB54JDQxiXZxkp4gt/Q=",
+          "dev": true
+        }
       }
     },
     "is-npm": {
@@ -4660,11 +4638,6 @@
       "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
       "dev": true
     },
-    "is-promise": {
-      "version": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
-      "dev": true
-    },
     "is-property": {
       "version": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
       "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
@@ -4803,6 +4776,12 @@
         "jasmine-core": "2.4.1"
       },
       "dependencies": {
+        "exit": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+          "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+          "dev": true
+        },
         "glob": {
           "version": "3.2.11",
           "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
@@ -5632,7 +5611,15 @@
       "dev": true,
       "requires": {
         "currently-unhandled": "0.4.1",
-        "signal-exit": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"
+        "signal-exit": "3.0.2"
+      },
+      "dependencies": {
+        "signal-exit": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+          "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+          "dev": true
+        }
       }
     },
     "lowercase-keys": {
@@ -5679,22 +5666,22 @@
       "dev": true
     },
     "math-clamp-x": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/math-clamp-x/-/math-clamp-x-1.2.0.tgz",
-      "integrity": "sha512-tqpjpBcIf9UulApz3EjWXqTZpMlr2vLN9PryC9ghoyCuRmqZaf3JJhPddzgQpJnKLi2QhoFnvKBFtJekAIBSYg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-clamp-x/-/math-clamp-x-1.1.0.tgz",
+      "integrity": "sha512-c7Hxz6Ji4HtwUSMI1HU3Y7pcWQyuINlnCeE1675ZfNbEELFHeqHnEQXrWB7kLiiNTMi6QM38txFAfKq2IYqZpQ==",
       "dev": true,
       "requires": {
-        "to-number-x": "2.0.0"
+        "to-number-x": "1.2.0"
       }
     },
     "math-sign-x": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/math-sign-x/-/math-sign-x-3.0.0.tgz",
-      "integrity": "sha512-OzPas41Pn4d16KHnaXmGxxY3/l3zK4OIXtmIwdhgZsxz4FDDcNnbrABYPg2vGfxIkaT9ezGnzDviRH7RfF44jQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/math-sign-x/-/math-sign-x-2.1.0.tgz",
+      "integrity": "sha512-3shFG0Ea5vOMCgQCrylyzu3POQRTvvaclb4VArnICToTgshMfA4Dlb9q9lZO1SD/rUD9mOTJZ7dTtlfCq7I91A==",
       "dev": true,
       "requires": {
         "is-nan-x": "1.0.1",
-        "to-number-x": "2.0.0"
+        "to-number-x": "1.2.0"
       }
     },
     "max-safe-integer": {
@@ -5824,11 +5811,6 @@
         "mime-db": "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz"
       }
     },
-    "mimic-fn": {
-      "version": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz",
-      "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=",
-      "dev": true
-    },
     "minimatch": {
       "version": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz",
       "integrity": "sha1-Kk5AkLlrLbBqnX3wEFWmKnfJt3Q=",
@@ -6035,11 +6017,6 @@
         "duplexer2": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"
       }
     },
-    "mute-stream": {
-      "version": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
-      "dev": true
-    },
     "nan-x": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/nan-x/-/nan-x-1.0.0.tgz",
@@ -6102,21 +6079,16 @@
       "dev": true
     },
     "normalize-space-x": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-space-x/-/normalize-space-x-3.0.0.tgz",
-      "integrity": "sha512-tbCJerqZCCHPst4rRKgsTanLf45fjOyeAU5zE3mhDxJtFJKt66q39g2XArWhXelgTFVib8mNBUm6Wrd0LxYcfQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-space-x/-/normalize-space-x-2.0.0.tgz",
+      "integrity": "sha512-R3nAbBlbEtn649TVgKzhgALTjilK5bgsbIsbk7+dtiDcEpuVVr7cUezwO7Tnm5e3IgaULi2s+FfVGj9WzVq1WA==",
       "dev": true,
       "requires": {
         "cached-constructors-x": "1.0.0",
-        "trim-x": "3.0.0",
-        "white-space-x": "3.0.0"
+        "trim-x": "2.0.2",
+        "white-space-x": "2.0.3"
       }
     },
-    "npm-install-package": {
-      "version": "https://registry.npmjs.org/npm-install-package/-/npm-install-package-2.1.0.tgz",
-      "integrity": "sha1-1+/jz816sAYUuJbqUxGdyaslkSU=",
-      "dev": true
-    },
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -6158,21 +6130,21 @@
       "dev": true,
       "requires": {
         "attempt-x": "1.1.1",
-        "has-own-property-x": "3.2.0",
+        "has-own-property-x": "3.1.1",
         "has-symbol-support-x": "1.4.1",
         "is-falsey-x": "1.0.1",
-        "is-index-x": "1.1.0",
-        "is-primitive": "2.0.0",
+        "is-index-x": "1.0.0",
+        "is-primitive": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
         "is-string": "1.0.4",
         "property-is-enumerable-x": "1.1.0",
         "to-object-x": "1.5.0",
         "to-property-key-x": "2.0.2"
       },
       "dependencies": {
-        "is-primitive": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-          "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
+        "has-symbol-support-x": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.1.tgz",
+          "integrity": "sha512-JkaetveU7hFbqnAC1EV1sF4rlojU2D4Usc5CmS69l6NfmPDnpnFUegzFg33eDkkpNCxZ0mQp65HwUDrNFS/8MA==",
           "dev": true
         }
       }
@@ -6202,14 +6174,6 @@
         "wrappy": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
       }
     },
-    "onetime": {
-      "version": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-      "dev": true,
-      "requires": {
-        "mimic-fn": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz"
-      }
-    },
     "optimist": {
       "version": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
       "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
@@ -6296,15 +6260,15 @@
       }
     },
     "parse-int-x": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/parse-int-x/-/parse-int-x-2.0.0.tgz",
-      "integrity": "sha512-NIMm52gmd1+0qxJK8lV3OZ4zzWpRH1xcz9xCHXl+DNzddwUdS4NEtd7BmTeK7iCIXoaK5e6BoDMHgieH2eNIhg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/parse-int-x/-/parse-int-x-1.1.0.tgz",
+      "integrity": "sha512-gEo/Rb66RiK7Ba89Va5JWYrfF2TdIblmawQuJEs4XxHIsTE0wi1ME5M/O21L8JJ9NjOlA+CqHCbkZjHRZnQPrg==",
       "dev": true,
       "requires": {
         "cached-constructors-x": "1.0.0",
-        "nan-x": "1.0.0",
         "to-string-x": "1.4.2",
-        "trim-left-x": "3.0.0"
+        "trim-x": "2.0.2",
+        "white-space-x": "2.0.3"
       }
     },
     "parse-passwd": {
@@ -6689,9 +6653,9 @@
       }
     },
     "plugin-error": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.0.tgz",
-      "integrity": "sha1-N9Zr2W6jNLdHJYTbFJZ3uiM3ck4=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
       "dev": true,
       "requires": {
         "ansi-colors": "1.0.1",
@@ -6880,11 +6844,6 @@
       "integrity": "sha1-zgPF/wk1vB2daanxTL0Y5WjWdiU=",
       "dev": true
     },
-    "querystring": {
-      "version": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-      "dev": true
-    },
     "randomatic": {
       "version": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz",
       "integrity": "sha1-EQ3Kv/OX6dz/fAeJzMCkmt8exbs=",
@@ -7117,25 +7076,6 @@
         "global-modules": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz"
       }
     },
-    "resolve-url": {
-      "version": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-      "dev": true
-    },
-    "restore-cursor": {
-      "version": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-      "dev": true,
-      "requires": {
-        "onetime": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-        "signal-exit": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"
-      }
-    },
-    "rgb2hex": {
-      "version": "https://registry.npmjs.org/rgb2hex/-/rgb2hex-0.1.0.tgz",
-      "integrity": "sha1-zNVfhgrgxcTqN1BLlY5ELY0SMls=",
-      "dev": true
-    },
     "right-align": {
       "version": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
       "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
@@ -7159,19 +7099,11 @@
       "dev": true
     },
     "rollup-plugin-hypothetical": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-hypothetical/-/rollup-plugin-hypothetical-2.0.0.tgz",
-      "integrity": "sha512-bTPZECCQ9G7LJBmwVxNqkNheb+3ayPj1c46ZVjdVQFGMJ+ive5Bq6JnWeoE/x2Nk0CEBp4L8J5oOXZRDk/6MYQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-hypothetical/-/rollup-plugin-hypothetical-2.1.0.tgz",
+      "integrity": "sha512-MlxPQTkMtiRUtyhIJ7FpBvTzWtar8eFBA+V7/J6Deg9fSgIIHwL6bJKK1Wl1uWSWtOrWhOmtsMwb9F6aagP/Pg==",
       "dev": true
     },
-    "run-async": {
-      "version": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
-      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
-      "dev": true,
-      "requires": {
-        "is-promise": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"
-      }
-    },
     "rx": {
       "version": "https://registry.npmjs.org/rx/-/rx-2.3.24.tgz",
       "integrity": "sha1-FPlQpCF9fjXapxu8vljv9o6ksrc=",
@@ -7206,6 +7138,15 @@
       "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
       "dev": true
     },
+    "safe-to-string-x": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/safe-to-string-x/-/safe-to-string-x-2.0.3.tgz",
+      "integrity": "sha512-hbxWZc0a+3VG7SpSKpZbBiXwQOV/bW/hwNvMFRPCL/60Ze/6Y8atHqv/0dWiWc9sHmkFqVCMR5gjmukMzKnA6A==",
+      "dev": true,
+      "requires": {
+        "to-string-symbols-supported-x": "1.0.0"
+      }
+    },
     "samsam": {
       "version": "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz",
       "integrity": "sha1-vsEf3IOp/aBjQBIQ5AF2wwJNFWc=",
@@ -7399,11 +7340,6 @@
       "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
       "dev": true
     },
-    "signal-exit": {
-      "version": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-      "dev": true
-    },
     "sinon": {
       "version": "https://registry.npmjs.org/sinon/-/sinon-1.17.7.tgz",
       "integrity": "sha1-RUKk9JugxFwF6y6d2dID4rjv4L8=",
@@ -7552,22 +7488,6 @@
         }
       }
     },
-    "source-map-resolve": {
-      "version": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.3.1.tgz",
-      "integrity": "sha1-YQ9hIqRFuN1RU1oqcbeD38Ekh2E=",
-      "dev": true,
-      "requires": {
-        "atob": "https://registry.npmjs.org/atob/-/atob-1.1.3.tgz",
-        "resolve-url": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-        "source-map-url": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.3.0.tgz",
-        "urix": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"
-      }
-    },
-    "source-map-url": {
-      "version": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.3.0.tgz",
-      "integrity": "sha1-fsrxO1e80J2opAxdJp2zN5nUqvk=",
-      "dev": true
-    },
     "sparkles": {
       "version": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz",
       "integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=",
@@ -7990,15 +7910,15 @@
       "dev": true
     },
     "to-integer-x": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/to-integer-x/-/to-integer-x-3.0.0.tgz",
-      "integrity": "sha512-794L2Lpwjtynm7RxahJi2YdbRY75gTxUW27TMuN26UgwPkmJb/+HPhkFEFbz+E4vNoiP0dxq5tq5fkXoXLaK/w==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/to-integer-x/-/to-integer-x-2.1.0.tgz",
+      "integrity": "sha512-M9iETTi+xMMZtUC70q4VE63XL2mXmNABxwxsIebOfd8K4ZHKCJLD9GyE6RlEPnbOPZj21QinuoVkqWsBsBknRA==",
       "dev": true,
       "requires": {
         "is-finite-x": "3.0.2",
         "is-nan-x": "1.0.1",
-        "math-sign-x": "3.0.0",
-        "to-number-x": "2.0.0"
+        "math-sign-x": "2.1.0",
+        "to-number-x": "1.2.0"
       }
     },
     "to-iso-string": {
@@ -8007,16 +7927,16 @@
       "dev": true
     },
     "to-number-x": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-number-x/-/to-number-x-2.0.0.tgz",
-      "integrity": "sha512-lGOnCoccUoSzjZ/9Uen8TC4+VFaQcFGhTroWTv2tYWxXgyJV1zqAZ8hEIMkez/Eo790fBMOjidTnQ/OJSCvAoQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/to-number-x/-/to-number-x-1.2.0.tgz",
+      "integrity": "sha512-Pv/VvC0nLIqtEK1FRtmfWCSWE1gliXt0YSjFcjSIy8YMGyIovbUfX2HIgn/KXqtgB7NlqWWKIaj3mFukzPf0ig==",
       "dev": true,
       "requires": {
         "cached-constructors-x": "1.0.0",
         "nan-x": "1.0.0",
-        "parse-int-x": "2.0.0",
+        "parse-int-x": "1.1.0",
         "to-primitive-x": "1.1.0",
-        "trim-x": "3.0.0"
+        "trim-x": "2.0.2"
       }
     },
     "to-object-x": {
@@ -8037,18 +7957,65 @@
       "requires": {
         "has-symbol-support-x": "1.4.1",
         "is-date-object": "1.0.1",
-        "is-function-x": "3.3.0",
+        "is-function-x": "3.2.0",
         "is-nil-x": "1.4.1",
-        "is-primitive": "2.0.0",
+        "is-primitive": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
         "is-symbol": "1.0.1",
         "require-object-coercible-x": "1.4.1",
         "validate.io-undefined": "1.0.3"
       },
       "dependencies": {
-        "is-primitive": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-          "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
+        "has-symbol-support-x": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.1.tgz",
+          "integrity": "sha512-JkaetveU7hFbqnAC1EV1sF4rlojU2D4Usc5CmS69l6NfmPDnpnFUegzFg33eDkkpNCxZ0mQp65HwUDrNFS/8MA==",
+          "dev": true
+        },
+        "has-to-string-tag-x": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
+          "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
+          "dev": true,
+          "requires": {
+            "has-symbol-support-x": "1.4.1"
+          }
+        },
+        "is-function-x": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/is-function-x/-/is-function-x-3.2.0.tgz",
+          "integrity": "sha512-ANQAythCIUKu0UprLZubZsYwAhYcNoM/FlrQSyFIXDoBzeGcHo6SHNPHCAl/T7UQyNiGzBirfUq0znic8P/Bew==",
+          "dev": true,
+          "requires": {
+            "attempt-x": "1.1.1",
+            "has-to-string-tag-x": "1.4.1",
+            "is-falsey-x": "1.0.1",
+            "is-primitive": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
+            "normalize-space-x": "2.0.0",
+            "replace-comments-x": "2.0.0",
+            "to-boolean-x": "1.0.1",
+            "to-string-tag-x": "1.4.2"
+          }
+        },
+        "lodash.isnull": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/lodash.isnull/-/lodash.isnull-3.0.0.tgz",
+          "integrity": "sha1-+vvlnqHcon7teGU0A53YTC4HxW4=",
+          "dev": true
+        },
+        "to-string-tag-x": {
+          "version": "1.4.2",
+          "resolved": "https://registry.npmjs.org/to-string-tag-x/-/to-string-tag-x-1.4.2.tgz",
+          "integrity": "sha512-ytO9eLigxsQQLGuab0C1iSSTzKdJNVSlBg0Spg4J/rGAVrQJ5y774mo0SSzgGeTT4RJGGyJNfObXaTMzX0XDOQ==",
+          "dev": true,
+          "requires": {
+            "lodash.isnull": "3.0.0",
+            "validate.io-undefined": "1.0.3"
+          }
+        },
+        "validate.io-undefined": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/validate.io-undefined/-/validate.io-undefined-1.0.3.tgz",
+          "integrity": "sha1-fif8uzFbhB54JDQxiXZxkp4gt/Q=",
           "dev": true
         }
       }
@@ -8062,6 +8029,14 @@
         "has-symbol-support-x": "1.4.1",
         "to-primitive-x": "1.1.0",
         "to-string-x": "1.4.2"
+      },
+      "dependencies": {
+        "has-symbol-support-x": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.1.tgz",
+          "integrity": "sha512-JkaetveU7hFbqnAC1EV1sF4rlojU2D4Usc5CmS69l6NfmPDnpnFUegzFg33eDkkpNCxZ0mQp65HwUDrNFS/8MA==",
+          "dev": true
+        }
       }
     },
     "to-string-symbols-supported-x": {
@@ -8073,6 +8048,14 @@
         "cached-constructors-x": "1.0.0",
         "has-symbol-support-x": "1.4.1",
         "is-symbol": "1.0.1"
+      },
+      "dependencies": {
+        "has-symbol-support-x": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.1.tgz",
+          "integrity": "sha512-JkaetveU7hFbqnAC1EV1sF4rlojU2D4Usc5CmS69l6NfmPDnpnFUegzFg33eDkkpNCxZ0mQp65HwUDrNFS/8MA==",
+          "dev": true
+        }
       }
     },
     "to-string-tag-x": {
@@ -8103,14 +8086,14 @@
       }
     },
     "trim-left-x": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/trim-left-x/-/trim-left-x-3.0.0.tgz",
-      "integrity": "sha512-+m6cqkppI+CxQBTwWEZliOHpOBnCArGyMnS1WCLb6IRgukhTkiQu/TNEN5Lj2eM9jk8ewJsc7WxFZfmwNpRXWQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/trim-left-x/-/trim-left-x-2.0.1.tgz",
+      "integrity": "sha512-7JTQAjTmsUB07eDuVoBxAtRbvrC141gYhEnKoP5FHZGc7phaqjbqII7+nFT15gc73F0D7qPb7W+Ny8Im0Kip/Q==",
       "dev": true,
       "requires": {
         "cached-constructors-x": "1.0.0",
         "require-coercible-to-string-x": "1.0.0",
-        "white-space-x": "3.0.0"
+        "white-space-x": "2.0.3"
       }
     },
     "trim-newlines": {
@@ -8126,24 +8109,24 @@
       "dev": true
     },
     "trim-right-x": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/trim-right-x/-/trim-right-x-3.0.0.tgz",
-      "integrity": "sha512-iIqEsWEbWVodqdixJHi4FoayJkUxhoL4AvSNGp4FF4FfQKRPGizt8++/RnyC9od75y7P/S6EfONoVqP+NddiKA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/trim-right-x/-/trim-right-x-2.0.1.tgz",
+      "integrity": "sha512-hdz1fDE/roIkWWNtA43matOTi3dHgLhDkKTo+hFgLwlYSqjNt7Qr0QKZyik8ZDTpjUmrgHtU5/lb+gL/pngWvQ==",
       "dev": true,
       "requires": {
         "cached-constructors-x": "1.0.0",
         "require-coercible-to-string-x": "1.0.0",
-        "white-space-x": "3.0.0"
+        "white-space-x": "2.0.3"
       }
     },
     "trim-x": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/trim-x/-/trim-x-3.0.0.tgz",
-      "integrity": "sha512-w8s38RAUScQ6t3XqMkS75iz5ZkIYLQpVnv2lp3IuTS36JdlVzC54oe6okOf4Wz3UH4rr3XAb2xR3kR5Xei82fw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/trim-x/-/trim-x-2.0.2.tgz",
+      "integrity": "sha512-FnvMjV360hsj/OQpAaXqAKspNqyawkVe5zkWH/aOVOGcSnbeJYpeOYiaKIZYpu0ZQes3pq7IRm4whHJqAoev7w==",
       "dev": true,
       "requires": {
-        "trim-left-x": "3.0.0",
-        "trim-right-x": "3.0.0"
+        "trim-left-x": "2.0.1",
+        "trim-right-x": "2.0.1"
       }
     },
     "ts-loader": {
@@ -8908,27 +8891,6 @@
       "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
       "dev": true
     },
-    "urix": {
-      "version": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "dev": true
-    },
-    "url": {
-      "version": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "dev": true,
-      "requires": {
-        "punycode": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-        "querystring": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-          "dev": true
-        }
-      }
-    },
     "url-parse-lax": {
       "version": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
       "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
@@ -9354,8 +9316,8 @@
       "requires": {
         "archiver": "2.1.1",
         "babel-runtime": "6.26.0",
-        "css-parse": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
-        "css-value": "https://registry.npmjs.org/css-value/-/css-value-0.0.1.tgz",
+        "css-parse": "2.0.0",
+        "css-value": "0.0.1",
         "deepmerge": "2.0.1",
         "ejs": "2.5.7",
         "gaze": "1.1.2",
@@ -9363,17 +9325,17 @@
         "inquirer": "3.3.0",
         "json-stringify-safe": "5.0.1",
         "mkdirp": "0.5.1",
-        "npm-install-package": "https://registry.npmjs.org/npm-install-package/-/npm-install-package-2.1.0.tgz",
+        "npm-install-package": "2.1.0",
         "optimist": "0.6.1",
         "q": "1.5.1",
         "request": "2.83.0",
-        "rgb2hex": "https://registry.npmjs.org/rgb2hex/-/rgb2hex-0.1.0.tgz",
+        "rgb2hex": "0.1.0",
         "safe-buffer": "5.1.1",
         "supports-color": "5.0.1",
-        "url": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+        "url": "0.11.0",
         "validator": "9.1.2",
         "wdio-dot-reporter": "0.0.9",
-        "wgxpath": "https://registry.npmjs.org/wgxpath/-/wgxpath-1.0.0.tgz"
+        "wgxpath": "1.0.0"
       },
       "dependencies": {
         "ajv": {
@@ -9388,6 +9350,12 @@
             "json-schema-traverse": "0.3.1"
           }
         },
+        "amdefine": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+          "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+          "dev": true
+        },
         "ansi-escapes": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz",
@@ -9415,7 +9383,7 @@
           "integrity": "sha1-/2YrSnggFJSj7lRNOjP+dJZQnrw=",
           "dev": true,
           "requires": {
-            "archiver-utils": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz",
+            "archiver-utils": "1.3.0",
             "async": "2.6.0",
             "buffer-crc32": "0.2.13",
             "glob": "7.1.2",
@@ -9425,6 +9393,20 @@
             "zip-stream": "1.2.0"
           }
         },
+        "archiver-utils": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz",
+          "integrity": "sha1-5QtMCccL89aA4y/xt5lOn52JUXQ=",
+          "dev": true,
+          "requires": {
+            "glob": "7.1.2",
+            "graceful-fs": "4.1.11",
+            "lazystream": "1.0.0",
+            "lodash": "4.17.4",
+            "normalize-path": "2.1.1",
+            "readable-stream": "2.3.3"
+          }
+        },
         "asn1": {
           "version": "0.2.3",
           "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
@@ -9452,6 +9434,12 @@
           "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
           "dev": true
         },
+        "atob": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/atob/-/atob-1.1.3.tgz",
+          "integrity": "sha1-lfE2KbEsOlGl0hWr3OKqnzL4B3M=",
+          "dev": true
+        },
         "aws-sign2": {
           "version": "0.7.0",
           "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
@@ -9552,6 +9540,15 @@
             }
           }
         },
+        "cli-cursor": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+          "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+          "dev": true,
+          "requires": {
+            "restore-cursor": "2.0.0"
+          }
+        },
         "cli-width": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
@@ -9639,6 +9636,33 @@
             }
           }
         },
+        "css": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/css/-/css-2.2.1.tgz",
+          "integrity": "sha1-c6TIHehdtmTU7mdPfUcIXjstVdw=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3",
+            "source-map": "0.1.43",
+            "source-map-resolve": "0.3.1",
+            "urix": "0.1.0"
+          }
+        },
+        "css-parse": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
+          "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=",
+          "dev": true,
+          "requires": {
+            "css": "2.2.1"
+          }
+        },
+        "css-value": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/css-value/-/css-value-0.0.1.tgz",
+          "integrity": "sha1-Xv1sLupeof1rasV+wEJ7GEUkJOo=",
+          "dev": true
+        },
         "dashdash": {
           "version": "1.14.1",
           "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -9714,6 +9738,15 @@
           "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
           "dev": true
         },
+        "figures": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+          "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+          "dev": true,
+          "requires": {
+            "escape-string-regexp": "1.0.5"
+          }
+        },
         "forever-agent": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -9780,6 +9813,12 @@
             "minimatch": "3.0.4"
           }
         },
+        "graceful-fs": {
+          "version": "4.1.11",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+          "dev": true
+        },
         "har-schema": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
@@ -9861,13 +9900,13 @@
           "requires": {
             "ansi-escapes": "3.0.0",
             "chalk": "2.3.0",
-            "cli-cursor": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+            "cli-cursor": "2.1.0",
             "cli-width": "2.2.0",
             "external-editor": "2.1.0",
-            "figures": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+            "figures": "2.0.0",
             "lodash": "4.17.4",
-            "mute-stream": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-            "run-async": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+            "mute-stream": "0.0.7",
+            "run-async": "2.3.0",
             "rx-lite": "4.0.8",
             "rx-lite-aggregates": "4.0.8",
             "string-width": "2.1.1",
@@ -9881,6 +9920,12 @@
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },
+        "is-promise": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+          "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+          "dev": true
+        },
         "is-typedarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
@@ -9930,6 +9975,15 @@
             "verror": "1.10.0"
           }
         },
+        "lazystream": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
+          "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "2.3.3"
+          }
+        },
         "lodash": {
           "version": "4.17.4",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
@@ -9951,6 +10005,12 @@
             "mime-db": "1.30.0"
           }
         },
+        "mimic-fn": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz",
+          "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=",
+          "dev": true
+        },
         "minimatch": {
           "version": "3.0.4",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -9975,6 +10035,12 @@
             "minimist": "0.0.8"
           }
         },
+        "mute-stream": {
+          "version": "0.0.7",
+          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+          "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+          "dev": true
+        },
         "normalize-path": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
@@ -9984,6 +10050,12 @@
             "remove-trailing-separator": "1.1.0"
           }
         },
+        "npm-install-package": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/npm-install-package/-/npm-install-package-2.1.0.tgz",
+          "integrity": "sha1-1+/jz816sAYUuJbqUxGdyaslkSU=",
+          "dev": true
+        },
         "oauth-sign": {
           "version": "0.8.2",
           "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
@@ -9999,6 +10071,15 @@
             "wrappy": "1.0.2"
           }
         },
+        "onetime": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+          "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+          "dev": true,
+          "requires": {
+            "mimic-fn": "1.1.0"
+          }
+        },
         "optimist": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
@@ -10051,6 +10132,12 @@
           "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
           "dev": true
         },
+        "querystring": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+          "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+          "dev": true
+        },
         "readable-stream": {
           "version": "2.3.3",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
@@ -10108,12 +10195,49 @@
             "uuid": "3.2.1"
           }
         },
+        "resolve-url": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+          "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+          "dev": true
+        },
+        "restore-cursor": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+          "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+          "dev": true,
+          "requires": {
+            "onetime": "2.0.1",
+            "signal-exit": "3.0.2"
+          }
+        },
+        "rgb2hex": {
+          "version": "0.1.0",
+          "resolved": "https://registry.npmjs.org/rgb2hex/-/rgb2hex-0.1.0.tgz",
+          "integrity": "sha1-zNVfhgrgxcTqN1BLlY5ELY0SMls=",
+          "dev": true
+        },
+        "run-async": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+          "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+          "dev": true,
+          "requires": {
+            "is-promise": "2.1.0"
+          }
+        },
         "safe-buffer": {
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
           "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
           "dev": true
         },
+        "signal-exit": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+          "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+          "dev": true
+        },
         "sntp": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
@@ -10123,6 +10247,33 @@
             "hoek": "4.2.0"
           }
         },
+        "source-map": {
+          "version": "0.1.43",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+          "dev": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        },
+        "source-map-resolve": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.3.1.tgz",
+          "integrity": "sha1-YQ9hIqRFuN1RU1oqcbeD38Ekh2E=",
+          "dev": true,
+          "requires": {
+            "atob": "1.1.3",
+            "resolve-url": "0.2.1",
+            "source-map-url": "0.3.0",
+            "urix": "0.1.0"
+          }
+        },
+        "source-map-url": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.3.0.tgz",
+          "integrity": "sha1-fsrxO1e80J2opAxdJp2zN5nUqvk=",
+          "dev": true
+        },
         "sshpk": {
           "version": "1.13.1",
           "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
@@ -10234,6 +10385,30 @@
           "dev": true,
           "optional": true
         },
+        "urix": {
+          "version": "0.1.0",
+          "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+          "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+          "dev": true
+        },
+        "url": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+          "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+          "dev": true,
+          "requires": {
+            "punycode": "1.3.2",
+            "querystring": "0.2.0"
+          },
+          "dependencies": {
+            "punycode": {
+              "version": "1.3.2",
+              "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+              "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+              "dev": true
+            }
+          }
+        },
         "util-deprecate": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -10263,6 +10438,12 @@
           "integrity": "sha1-kpsq2v1J1rBTT9oGjocxm0fjj+U=",
           "dev": true
         },
+        "wgxpath": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/wgxpath/-/wgxpath-1.0.0.tgz",
+          "integrity": "sha1-7vikudVYzEla06mit1FZfs2a9pA=",
+          "dev": true
+        },
         "wordwrap": {
           "version": "0.0.3",
           "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
@@ -10287,7 +10468,7 @@
           "integrity": "sha1-qLxF9MG0lpnGuQGYuqyqzbzUugQ=",
           "dev": true,
           "requires": {
-            "archiver-utils": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz",
+            "archiver-utils": "1.3.0",
             "compress-commons": "1.2.2",
             "lodash": "4.17.4",
             "readable-stream": "2.3.3"
@@ -10295,11 +10476,6 @@
         }
       }
     },
-    "wgxpath": {
-      "version": "https://registry.npmjs.org/wgxpath/-/wgxpath-1.0.0.tgz",
-      "integrity": "sha1-7vikudVYzEla06mit1FZfs2a9pA=",
-      "dev": true
-    },
     "whatwg-fetch": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz",
@@ -10315,9 +10491,9 @@
       }
     },
     "white-space-x": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/white-space-x/-/white-space-x-3.0.0.tgz",
-      "integrity": "sha512-nMPVXGMdi/jQepXKryxqzEh/vCwdOYY/u6NZy40glMHvZfEr7/+vQKnDhEq4rZ1nniOFq9GWohQYB30uW/5Olg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/white-space-x/-/white-space-x-2.0.3.tgz",
+      "integrity": "sha512-An6uHDfZizY0t7x8iyY8nLej1lnqyaFSyTKjwwqS0VIhvV4tof6a+Et4uJVFlZh7HUAOgKoZfm5hFzl/D4xDgw==",
       "dev": true
     },
     "widest-line": {
diff --git a/test/rxjs/rxjs.Observable.collection.spec.ts b/test/rxjs/rxjs.Observable.collection.spec.ts
index 00bd1d130..e7f6ba608 100644
--- a/test/rxjs/rxjs.Observable.collection.spec.ts
+++ b/test/rxjs/rxjs.Observable.collection.spec.ts
@@ -11,9 +11,15 @@ import {asyncTest} from '../test-util';
 describe('Observable.collection', () => {
   let log: string[];
   let observable1: any;
+  let defaultTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
 
   beforeEach(() => {
     log = [];
+    jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
+  });
+
+  afterEach(function() {
+    jasmine.DEFAULT_TIMEOUT_INTERVAL = defaultTimeout;
   });
 
   it('elementAt func callback should run in the correct zone', () => {
diff --git a/test/rxjs/rxjs.Observable.merge.spec.ts b/test/rxjs/rxjs.Observable.merge.spec.ts
index bb940cae8..9f1528009 100644
--- a/test/rxjs/rxjs.Observable.merge.spec.ts
+++ b/test/rxjs/rxjs.Observable.merge.spec.ts
@@ -11,9 +11,15 @@ import {asyncTest} from '../test-util';
 describe('Observable.merge', () => {
   let log: string[];
   let observable1: any;
+  let defaultTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
 
   beforeEach(() => {
     log = [];
+    jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
+  });
+
+  afterEach(() => {
+    jasmine.DEFAULT_TIMEOUT_INTERVAL = defaultTimeout;
   });
 
   it('expand func callback should run in the correct zone', () => {
diff --git a/test/rxjs/rxjs.Observable.take.spec.ts b/test/rxjs/rxjs.Observable.take.spec.ts
index 42aed8445..0edc377a2 100644
--- a/test/rxjs/rxjs.Observable.take.spec.ts
+++ b/test/rxjs/rxjs.Observable.take.spec.ts
@@ -11,9 +11,15 @@ import {asyncTest} from '../test-util';
 describe('Observable.take', () => {
   let log: string[];
   let observable1: any;
+  let defaultTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
 
   beforeEach(() => {
     log = [];
+    jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
+  });
+
+  afterEach(() => {
+    jasmine.DEFAULT_TIMEOUT_INTERVAL = defaultTimeout;
   });
 
   it('take func callback should run in the correct zone', () => {
diff --git a/test/zone-spec/long-stack-trace-zone.spec.ts b/test/zone-spec/long-stack-trace-zone.spec.ts
index 540128928..4515c2965 100644
--- a/test/zone-spec/long-stack-trace-zone.spec.ts
+++ b/test/zone-spec/long-stack-trace-zone.spec.ts
@@ -16,6 +16,7 @@ describe(
       let log: Error[];
       let lstz: Zone;
       let longStackTraceZoneSpec = (Zone as any)['longStackTraceZoneSpec'];
+      let defaultTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
 
       beforeEach(function() {
         lstz = Zone.current.fork(longStackTraceZoneSpec).fork({
@@ -29,6 +30,11 @@ describe(
         });
 
         log = [];
+        jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
+      });
+
+      afterEach(function() {
+        jasmine.DEFAULT_TIMEOUT_INTERVAL = defaultTimeout;
       });
 
       function expectElapsed(stack: string, expectedCount: number) {