From c88d2cdae98983251b4803763dbc3a7c1376775c Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 17 Feb 2019 08:48:41 +0200
Subject: [PATCH 01/69] paths is an object now

---
 core/src/modules/config.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/modules/config.js b/core/src/modules/config.js
index f36c486a1..79c9f99b9 100644
--- a/core/src/modules/config.js
+++ b/core/src/modules/config.js
@@ -21,8 +21,9 @@ export default class Config extends Module {
     }
 
     getPath(id, full) {
-        const path = this.paths.find(path => path.id === id);
-        return full ? path : path.path;
+        return this.paths[id];
+        // const path = this.paths.find(path => path.id === id);
+        // return full ? path : path.path;
     }
 
     get config() {

From 2c23f18e89070d0d3acfac3f4aefb49e5998b0d6 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 17 Feb 2019 11:12:12 +0200
Subject: [PATCH 02/69] New installer compliance

---
 core/src/main.js           | 222 +++++++++++++++++++------------------
 core/src/modules/config.js |  12 ++
 2 files changed, 129 insertions(+), 105 deletions(-)

diff --git a/core/src/main.js b/core/src/main.js
index 1cdb18960..35e883c99 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -8,6 +8,8 @@
  * LICENSE file in the root directory of this source tree.
 */
 
+const tests = false;
+
 import path from 'path';
 import sass from 'node-sass';
 import { BrowserWindow as OriginalBrowserWindow, dialog, session } from 'electron';
@@ -17,43 +19,10 @@ import keytar from 'keytar';
 
 import { FileUtils, BDIpc, Config, WindowUtils, CSSEditor, Database } from './modules';
 
-const tests = typeof PRODUCTION === 'undefined';
-
-const _basePath = tests ? path.resolve(__dirname, '..', '..') : __dirname;
-const _baseDataPath = tests ? path.resolve(_basePath, 'tests') : _basePath;
-
+const packageJson = require(path.resolve(__dirname, 'package.json'));
 const sparkplug = path.resolve(__dirname, 'sparkplug.js');
 
-const _clientScript = tests
-    ? path.resolve(_basePath, 'client', 'dist', 'betterdiscord.client.js')
-    : path.resolve(_basePath, 'betterdiscord.client.js');
-const _cssEditorPath = tests
-    ? path.resolve(__dirname, '..', '..', 'csseditor', 'dist')
-    : path.resolve(__dirname, 'csseditor');
-
-const _dataPath = path.resolve(_baseDataPath, 'data');
-const _extPath = path.resolve(_baseDataPath, 'ext');
-const _pluginPath = path.resolve(_extPath, 'plugins');
-const _themePath = path.resolve(_extPath, 'themes');
-const _modulePath = path.resolve(_extPath, 'modules');
-
-const version = require(path.resolve(_basePath, 'package.json')).version;
-
-const paths = [
-    { id: 'base', path: _basePath },
-    { id: 'cs', path: _clientScript },
-    { id: 'data', path: _dataPath },
-    { id: 'ext', path: _extPath },
-    { id: 'plugins', path: _pluginPath },
-    { id: 'themes', path: _themePath },
-    { id: 'modules', path: _modulePath },
-    { id: 'csseditor', path: _cssEditorPath }
-];
-
-const globals = {
-    version,
-    paths
-};
+let configProxy;
 
 const CSP = {
     'img-src': ['https://cdn.betterttv.net', 'https://cdn.frankerfacez.com'],
@@ -64,45 +33,6 @@ const CSP = {
     ]
 };
 
-class BrowserWindow extends OriginalBrowserWindow {
-    constructor(originalOptions) {
-        const userOptions = BrowserWindow.userWindowPreferences;
-
-        const options = deepmerge(originalOptions, userOptions);
-        options.webPreferences = Object.assign({}, options.webPreferences);
-
-        // Make sure Node integration is enabled
-        options.webPreferences.preload = sparkplug;
-
-        super(options);
-
-        Object.defineProperty(this, '__bd_preload', {value: []});
-
-        if (originalOptions.webPreferences && originalOptions.webPreferences.preload) {
-            this.__bd_preload.push(originalOptions.webPreferences.preload);
-        }
-        if (userOptions.webPreferences && userOptions.webPreferences.preload) {
-            this.__bd_preload.push(path.resolve(_dataPath, userOptions.webPreferences.preload));
-        }
-
-        Object.defineProperty(this, '__bd_options', {value: options});
-        Object.freeze(options);
-        Object.freeze(options.webPreferences);
-        Object.freeze(this.__bd_preload);
-    }
-
-    static get userWindowPreferences() {
-        try {
-            const userWindowPreferences = require(path.join(_dataPath, 'window'));
-            if (typeof userWindowPreferences === 'object') return userWindowPreferences;
-        } catch (err) {
-            console.log('[BetterDiscord] Error getting window preferences:', err);
-        }
-
-        return {};
-    }
-}
-
 class Comms {
     constructor(bd) {
         this.bd = bd;
@@ -139,10 +69,10 @@ class Comms {
 
         BDIpc.on('bd-dba', (event, options) => this.bd.dbInstance.exec(options), true);
 
-        BDIpc.on('bd-keytar-get', (event, {service, account}) => keytar.getPassword(service, account), true);
-        BDIpc.on('bd-keytar-set', (event, {service, account, password}) => keytar.setPassword(service, account, password), true);
-        BDIpc.on('bd-keytar-delete', (event, {service, account}) => keytar.deletePassword(service, account), true);
-        BDIpc.on('bd-keytar-find-credentials', (event, {service}) => keytar.findCredentials(service), true);
+        BDIpc.on('bd-keytar-get', (event, { service, account }) => keytar.getPassword(service, account), true);
+        BDIpc.on('bd-keytar-set', (event, { service, account, password }) => keytar.setPassword(service, account, password), true);
+        BDIpc.on('bd-keytar-delete', (event, { service, account }) => keytar.deletePassword(service, account), true);
+        BDIpc.on('bd-keytar-find-credentials', (event, { service }) => keytar.findCredentials(service), true);
     }
 
     async send(channel, message) {
@@ -158,38 +88,84 @@ class Comms {
     }
 }
 
+class BrowserWindow extends OriginalBrowserWindow {
+    constructor(originalOptions) {
+        const userOptions = BrowserWindow.userWindowPreferences;
+
+        const options = deepmerge(originalOptions, userOptions);
+        options.webPreferences = Object.assign({}, options.webPreferences);
+
+        // Make sure Node integration is enabled
+        options.webPreferences.preload = sparkplug;
+
+        super(options);
+
+        Object.defineProperty(this, '__bd_preload', { value: [] });
+
+        if (originalOptions.webPreferences && originalOptions.webPreferences.preload) {
+            this.__bd_preload.push(originalOptions.webPreferences.preload);
+        }
+        if (userOptions.webPreferences && userOptions.webPreferences.preload) {
+            this.__bd_preload.push(path.resolve(configProxy().getPath('data'), userOptions.webPreferences.preload));
+        }
+
+        Object.defineProperty(this, '__bd_options', { value: options });
+        Object.freeze(options);
+        Object.freeze(options.webPreferences);
+        Object.freeze(this.__bd_preload);
+    }
+
+    static get userWindowPreferences() {
+        try {
+            const userWindowPreferences = require(path.join(configProxy().getPath('data'), 'window'));
+            if (typeof userWindowPreferences === 'object') return userWindowPreferences;
+        } catch (err) {
+            console.log('[BetterDiscord] Error getting window preferences:', err);
+        }
+
+        return {};
+    }
+}
+
 export class BetterDiscord {
 
+    get comms() { return this._comms ? this._comms : (this._commas = new Comms(this)); }
+    get database() { return this._db ? this._db : (this._db = new Database(this.config.getPath('data'))); }
+    get config() { return this._config ? this._config : (this._config = new Config(this._args)); }
+    get window() {  return this.windowUtils ? this.windowUtils.window : undefined; }
+
     constructor(args) {
+        console.log('[BetterDiscord|args] ', JSON.stringify(args, null, 4));
         if (BetterDiscord.loaded) {
-            console.log('Creating two BetterDiscord objects???');
+            console.log('[BetterDiscord] Creating two BetterDiscord objects???');
             return null;
         }
-        BetterDiscord.loaded = true;
 
-        this.injectScripts = this.injectScripts.bind(this);
-        this.ignite = this.ignite.bind(this);
+        BetterDiscord.loaded = true;
+        this._args = args;
 
-        this.config = new Config(args || globals);
-        this.dbInstance = new Database(this.config.getPath('data'));
-        this.comms = new Comms(this);
+        this.bindings();
+        this.parseClientPackage();
+        this.extraPaths();
+        this.database.init();
 
+        configProxy = () => this.config;
         this.init();
     }
 
+    bindings() {
+        this.injectScripts = this.injectScripts.bind(this);
+        this.ignite = this.ignite.bind(this);
+        this.ensureDirectories = this.ensureDirectories.bind(this);
+    }
+
     async init() {
+        console.log('[BetterDiscord] init');
         await this.waitForWindowUtils();
+        await this.ensureDirectories();
 
-        if (!tests) {
-            const basePath = this.config.getPath('base');
-            const files = await FileUtils.listDirectory(basePath);
-            const latestCs = FileUtils.resolveLatest(files, file => file.endsWith('.js') && file.startsWith('client.'), file => file.replace('client.', '').replace('.js', ''), 'client.', '.js');
-            this.config.getPath('cs', true).path = path.resolve(basePath, latestCs);
-        }
-
-        await FileUtils.ensureDirectory(this.config.getPath('ext'));
-
-        this.csseditor = new CSSEditor(this, this.config.getPath('csseditor'));
+        // TODO
+        // this.csseditor = new CSSEditor(this, this.config.getPath('csseditor'));
 
         this.windowUtils.on('did-finish-load', () => this.injectScripts(true));
 
@@ -202,6 +178,24 @@ export class BetterDiscord {
         }, 500);
     }
 
+    async ensureDirectories() {
+        await FileUtils.ensureDirectory(this.config.getPath('ext'));
+        await Promise.all([
+            FileUtils.ensureDirectory(this.config.getPath('plugins')),
+            FileUtils.ensureDirectory(this.config.getPath('themes')),
+            FileUtils.ensureDirectory(this.config.getPath('modules'))
+        ]);
+    }
+
+    async waitForWindowUtils() {
+        if (this.windowUtils) return this.windowUtils;
+        const window = await this.waitForWindow();
+        return this.windowUtils = new WindowUtils({ window });
+    }
+
+    /**
+     * Wait for Discord to load before doing any injection
+     */
     async waitForWindow() {
         return new Promise(resolve => {
             const defer = setInterval(() => {
@@ -215,14 +209,31 @@ export class BetterDiscord {
         });
     }
 
-    async waitForWindowUtils() {
-        if (this.windowUtils) return this.windowUtils;
-        const window = await this.waitForWindow();
-        return this.windowUtils = new WindowUtils({ window });
+    /**
+     * Parses the package.json of client script into config
+     */
+    parseClientPackage() {
+        const clientPath = this.config.getPath('client');
+        const { version, main } = require(`${clientPath}/package.json`);
+        this.config.addPath('client_script', `${clientPath}/${main}`);
+        this.config.setClientVersion(version);
+        console.log(`[BetterDiscord] Client v${this.config.clientVersion} - ${this.config.getPath('client_script')}`);
     }
 
-    get window() {
-        return this.windowUtils ? this.windowUtils.window : undefined;
+    /**
+     * Add extra paths to config
+     */
+    extraPaths() {
+        const baseDataPath = path.resolve(this.config.getPath('data'), '..');
+        const extPath = path.resolve(baseDataPath, 'ext');
+        const pluginPath = path.resolve(extPath, 'plugins');
+        const themePath = path.resolve(extPath, 'themes');
+        const modulePath = path.resolve(extPath, 'modules');
+
+        this.config.addPath('ext', extPath);
+        this.config.addPath('plugins', pluginPath);
+        this.config.addPath('themes', themePath);
+        this.config.addPath('modules', modulePath);
     }
 
     /**
@@ -245,8 +256,8 @@ export class BetterDiscord {
      * @param {Boolean} reload Whether the main window was reloaded
      */
     async injectScripts(reload = false) {
-        console.log(`RELOAD? ${reload}`);
-        return this.windowUtils.injectScript(this.config.getPath('cs'));
+        console.log(`[BetterDiscord] injecting ${this.config.getPath('client_script')}. Reload: ${reload}`);
+        return this.windowUtils.injectScript(this.config.getPath('client_script'));
     }
 
     /**
@@ -255,10 +266,11 @@ export class BetterDiscord {
      * Basically BetterDiscord needs to load before discord_desktop_core.
      */
     static patchBrowserWindow() {
+        console.log('[BetterDiscord] patching BrowserWindow');
         const electron = require('electron');
         const electron_path = require.resolve('electron');
         Object.assign(BrowserWindow, electron.BrowserWindow); // Assigns the new chrome-specific ones
-        const newElectron = Object.assign({}, electron, {BrowserWindow});
+        const newElectron = Object.assign({}, electron, { BrowserWindow });
         require.cache[electron_path].exports = newElectron;
     }
 
@@ -266,6 +278,7 @@ export class BetterDiscord {
      * Attaches an event handler for HTTP requests to update the Content Security Policy.
      */
     static hookSessionRequest() {
+        console.log('[BetterDiscord] hook session request');
         session.defaultSession.webRequest.onHeadersReceived((details, callback) => {
             for (const [header, values] of Object.entries(details.responseHeaders)) {
                 if (!header.match(/^Content-Security-Policy(-Report-Only)?$/i)) continue;
@@ -283,7 +296,6 @@ export class BetterDiscord {
             callback({ responseHeaders: details.responseHeaders });
         });
     }
-
 }
 
 BetterDiscord.patchBrowserWindow();
diff --git a/core/src/modules/config.js b/core/src/modules/config.js
index 79c9f99b9..2eb1c2dc0 100644
--- a/core/src/modules/config.js
+++ b/core/src/modules/config.js
@@ -16,6 +16,14 @@ export default class Config extends Module {
         return this.args.version;
     }
 
+    get clientVersion() {
+        return this.args.clientVersion;
+    }
+
+    setClientVersion(clientVersion) {
+        this.args.clientVersion = clientVersion;
+    }
+
     get paths() {
         return this.args.paths;
     }
@@ -26,6 +34,10 @@ export default class Config extends Module {
         // return full ? path : path.path;
     }
 
+    addPath(id, path) {
+        this.paths[id] = path;
+    }
+
     get config() {
         return {
             version: this.version,

From 9c1a93f4c1b01092d93a7e0e2cc78c298a258fa2 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 17 Feb 2019 11:58:45 +0200
Subject: [PATCH 03/69] Remove installer scripts, correct sparkplug external

---
 client/webpack.config.js | 2 +-
 core/src/main.js         | 4 ++--
 package.json             | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/client/webpack.config.js b/client/webpack.config.js
index 8f856b639..22a09c73d 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -39,7 +39,7 @@ module.exports = {
         process: 'require("process")',
         net: 'require("net")',
         request: 'require(require("path").join(require("electron").remote.app.getAppPath(), "node_modules", "request"))',
-        sparkplug: 'require("../../core/dist/sparkplug")',
+        sparkplug: 'require("../core/sparkplug")',
         'node-crypto': 'require("crypto")'
     },
     resolve: {
diff --git a/core/src/main.js b/core/src/main.js
index 35e883c99..d7581000b 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -46,7 +46,7 @@ class Comms {
 
         BDIpc.on('bd-sendToDiscord', (event, m) => this.sendToDiscord(m.channel, m.message), true);
 
-        BDIpc.on('bd-openCssEditor', (event, options) => this.bd.csseditor.openEditor(options), true);
+        // BDIpc.on('bd-openCssEditor', (event, options) => this.bd.csseditor.openEditor(options), true);
         BDIpc.on('bd-sendToCssEditor', (event, m) => this.sendToCssEditor(m.channel, m.message), true);
 
         BDIpc.on('bd-native-open', (event, options) => {
@@ -67,7 +67,7 @@ class Comms {
             });
         });
 
-        BDIpc.on('bd-dba', (event, options) => this.bd.dbInstance.exec(options), true);
+        BDIpc.on('bd-dba', (event, options) => this.bd.database.exec(options), true);
 
         BDIpc.on('bd-keytar-get', (event, { service, account }) => keytar.getPassword(service, account), true);
         BDIpc.on('bd-keytar-set', (event, { service, account, password }) => keytar.setPassword(service, account, password), true);
diff --git a/package.json b/package.json
index 2b79b8c44..9b5bc6396 100644
--- a/package.json
+++ b/package.json
@@ -79,8 +79,6 @@
     "watch_core": "npm run watch --prefix core",
     "build_csseditor": "npm run build --prefix csseditor",
     "watch_csseditor": "npm run watch --prefix csseditor",
-    "build_installer": "npm run build --prefix installer",
-    "watch_installer": "npm run watch --prefix installer",
     "lint": "eslint -f unix client/src core/src csseditor/src common && npm run sasslint",
     "lint_fix": "eslint -f unix client/src core/src csseditor/src common --fix",
     "sasslint": "sass-lint client/src/styles/**/*.scss -v",

From f3ea1929742354b61c16951b310024ccec881583 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 17 Feb 2019 12:18:16 +0200
Subject: [PATCH 04/69] Paths compatibility

---
 core/src/main.js           |  1 +
 core/src/modules/config.js | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/src/main.js b/core/src/main.js
index d7581000b..914abedec 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -143,6 +143,7 @@ export class BetterDiscord {
 
         BetterDiscord.loaded = true;
         this._args = args;
+        this.config.compatibility();
 
         this.bindings();
         this.parseClientPackage();
diff --git a/core/src/modules/config.js b/core/src/modules/config.js
index 2eb1c2dc0..2de5839d1 100644
--- a/core/src/modules/config.js
+++ b/core/src/modules/config.js
@@ -29,13 +29,12 @@ export default class Config extends Module {
     }
 
     getPath(id, full) {
-        return this.paths[id];
-        // const path = this.paths.find(path => path.id === id);
-        // return full ? path : path.path;
+        const path = this.paths.find(p => p.id === id);
+        return full ? path : path.path;
     }
 
     addPath(id, path) {
-        this.paths[id] = path;
+        this.paths.push({ id, path });
     }
 
     get config() {
@@ -45,4 +44,8 @@ export default class Config extends Module {
         };
     }
 
+    // Compatibility with old client code and new installer args
+    compatibility() {
+        this.args.paths = Object.entries(this.args.paths).map(([id, path]) => ({ id, path }));
+    }
 }

From 6699fcc1e70c1c885afce7d702e0e370fe8d2f18 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 17 Feb 2019 12:22:13 +0200
Subject: [PATCH 05/69] add base for compatibility

---
 core/src/main.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main.js b/core/src/main.js
index 914abedec..21de7b9d0 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -231,6 +231,7 @@ export class BetterDiscord {
         const themePath = path.resolve(extPath, 'themes');
         const modulePath = path.resolve(extPath, 'modules');
 
+        this.config.addPath('base', baseDataPath);
         this.config.addPath('ext', extPath);
         this.config.addPath('plugins', pluginPath);
         this.config.addPath('themes', themePath);

From 021e282b1c04feeafb4603ff3236a10a93a48ba3 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 17 Feb 2019 12:26:07 +0200
Subject: [PATCH 06/69] add tests flag back

---
 core/src/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main.js b/core/src/main.js
index 21de7b9d0..7469b0723 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -8,7 +8,7 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-const tests = false;
+const tests = typeof PRODUCTION === 'undefined';
 
 import path from 'path';
 import sass from 'node-sass';

From ccff016820c3def85c02ced3c3bb63d8e7f6ef18 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 17 Feb 2019 14:14:07 +0200
Subject: [PATCH 07/69] init comms module duh

---
 core/src/main.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main.js b/core/src/main.js
index 7469b0723..853cbecb4 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -151,6 +151,7 @@ export class BetterDiscord {
         this.database.init();
 
         configProxy = () => this.config;
+        const autoInitComms = this.comms;
         this.init();
     }
 

From 76e19c8469daaea60ed0cef6474efbc8ec4d6d31 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 18 Feb 2019 09:21:28 +0200
Subject: [PATCH 08/69] wip script updates

---
 gulpfile.babel.js              |   94 +-
 package-lock.json              | 5892 +++++++++++++++++---------------
 package.json                   |    5 +-
 scripts/package-release.js     |  172 +-
 scripts/package-release.js.old |   65 +
 scripts/releasestub.json       |   30 +
 6 files changed, 3381 insertions(+), 2877 deletions(-)
 create mode 100644 scripts/package-release.js.old
 create mode 100644 scripts/releasestub.json

diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index a27c9300e..111d5311c 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -11,57 +11,81 @@ import editjson from 'gulp-json-editor';
 import corepkg from './core/package';
 import clientpkg from './client/package';
 
-gulp.task('release-package', function () {
+// core-release >
+
+gulp.task('core-main', function () {
+    return pump([
+        gulp.src('core/dist/main.js'),
+        inject.after(`'use strict';\n`, 'const PRODUCTION = true;\n'),
+        rename(`core.${corepkg.version}.js`),
+        gulp.dest('release/core')
+    ]);
+});
+
+gulp.task('core-pkg', function() {
     return pump([
         gulp.src('package.json'),
-        editjson(function (mainpkg) {
-            delete mainpkg.main;
-            delete mainpkg.devDependencies;
-            delete mainpkg.scripts;
-            return mainpkg;
+        editjson(function(pkg) {
+            pkg.main = `core.${corepkg.version}.js`;
+            delete pkg.devDependencies;
+            delete pkg.scripts;
+            return pkg;
         }),
-        gulp.dest('release')
+        gulp.dest('release/core')
     ]);
 });
 
-gulp.task('client', function () {
+gulp.task('core-modules', function () {
     return pump([
-        gulp.src('client/dist/*.client-release.js'),
-        rename(`client.${clientpkg.version}.js`),
-        gulp.dest('release')
+        gulp.src('core/dist/modules/**/*'),
+        copy('release/core', { prefix: 2 })
     ]);
 });
 
-gulp.task('core', function () {
+gulp.task('core-sparkplug', function () {
     return pump([
-        gulp.src('core/dist/main.js'),
-        inject.after("'use strict';\n", 'const PRODUCTION = true;\n'),
-        rename(`core.${corepkg.version}.js`),
-        gulp.dest('release')
+        gulp.src('core/dist/sparkplug.js'),
+        gulp.dest('release/core')
     ]);
 });
 
-gulp.task('sparkplug', function () {
+gulp.task('core-release', gulp.parallel('core-main', 'core-pkg', 'core-sparkplug', 'core-modules'));
+
+// < core-release
+
+// client
+
+gulp.task('client-main', function () {
     return pump([
-        gulp.src('core/dist/sparkplug.js'),
-        gulp.dest('release')
+        gulp.src('client/dist/*.client-release.js'),
+        rename(`client.${clientpkg.version}.js`),
+        gulp.dest('release/client')
     ]);
 });
 
-gulp.task('core-modules', function () {
+gulp.task('client-pkg', function() {
     return pump([
-        gulp.src('core/dist/modules/**/*'),
-        copy('release', { prefix: 2 })
+        gulp.src('client/package.json'),
+        editjson(function (pkg) {
+            pkg.main = `client.${clientpkg.version}.js`;
+            delete pkg.scripts;
+            return pkg;
+        }),
+        gulp.dest('release/client')
     ]);
 });
 
-gulp.task('index', function () {
+gulp.task('client-sparkplug', function () {
     return pump([
-        file('index.js', `module.exports = require('./core.${corepkg.version}.js');`, {src: true}),
-        gulp.dest('release')
+        gulp.src('core/dist/sparkplug.js'),
+        gulp.dest('release/client')
     ]);
 });
 
+gulp.task('client-release', gulp.parallel('client-main', 'client-pkg', 'client-sparkplug'));
+
+// CSS Editor
+
 gulp.task('css-editor', function () {
     return pump([
         gulp.src('csseditor/dist/csseditor-release.js'),
@@ -70,8 +94,10 @@ gulp.task('css-editor', function () {
     ]);
 });
 
+// Deps
+
 gulp.task('node-modules', function () {
-    return copydeps('.', 'release');
+    return copydeps('.', 'release/core');
 });
 
 gulp.task('node-sass-bindings', gulp.series(function () {
@@ -79,7 +105,7 @@ gulp.task('node-sass-bindings', gulp.series(function () {
 }, function () {
     return pump([
         gulp.src('other/node_sass_bindings/**/*'),
-        copy('release/node_modules/node-sass/vendor', { prefix: 2 })
+        copy('release/core/node_modules/node-sass/vendor', { prefix: 2 })
     ]);
 }));
 
@@ -88,14 +114,16 @@ gulp.task('keytar-bindings', gulp.series(function () {
 }, function () {
     return pump([
         gulp.src('other/keytar/**/*'),
-        copy('release/node_modules/keytar/build/Release', {prefix: 2})
+        copy('release/core/node_modules/keytar/build/Release', { prefix: 2 })
     ]);
 }));
 
-gulp.task('dependencies', gulp.series('node-modules', gulp.parallel('node-sass-bindings', 'keytar-bindings')));
-
-gulp.task('build-release', gulp.parallel('release-package', 'client', 'core', 'sparkplug', 'core-modules', 'index', 'css-editor', 'dependencies'));
+// Other
 
-gulp.task('release', gulp.series(function () {
+gulp.task('del-release', function() {
     return del(['release/**/*']);
-}, 'build-release'));
+});
+
+gulp.task('dependencies', gulp.series('node-modules', gulp.parallel('node-sass-bindings', 'keytar-bindings')));
+gulp.task('build-release', gulp.parallel('core-release', 'client-release', 'dependencies'));
+gulp.task('tt', gulp.series('del-release', gulp.parallel('build-release')));
diff --git a/package-lock.json b/package-lock.json
index f89c269b8..de041d314 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,7 +27,7 @@
       "integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=",
       "dev": true,
       "requires": {
-        "acorn": "^4.0.3"
+        "acorn": "4.0.13"
       },
       "dependencies": {
         "acorn": {
@@ -44,7 +44,7 @@
       "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
       "dev": true,
       "requires": {
-        "acorn": "^3.0.4"
+        "acorn": "3.3.0"
       },
       "dependencies": {
         "acorn": {
@@ -66,10 +66,10 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
       "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
       "requires": {
-        "co": "^4.6.0",
-        "fast-deep-equal": "^1.0.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.3.0"
+        "co": "4.6.0",
+        "fast-deep-equal": "1.0.0",
+        "fast-json-stable-stringify": "2.0.0",
+        "json-schema-traverse": "0.3.1"
       }
     },
     "ajv-keywords": {
@@ -84,9 +84,9 @@
       "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2",
-        "longest": "^1.0.1",
-        "repeat-string": "^1.5.2"
+        "kind-of": "3.2.2",
+        "longest": "1.0.1",
+        "repeat-string": "1.6.1"
       },
       "dependencies": {
         "kind-of": {
@@ -95,7 +95,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -117,7 +117,7 @@
       "integrity": "sha1-Y3S03V1HGP884npnGjscrQdxMqk=",
       "dev": true,
       "requires": {
-        "ansi-wrap": "^0.1.0"
+        "ansi-wrap": "0.1.0"
       }
     },
     "ansi-cyan": {
@@ -175,8 +175,8 @@
       "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
       "dev": true,
       "requires": {
-        "micromatch": "^2.1.5",
-        "normalize-path": "^2.0.0"
+        "micromatch": "2.3.11",
+        "normalize-path": "2.1.1"
       },
       "dependencies": {
         "arr-diff": {
@@ -185,7 +185,7 @@
           "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "dev": true,
           "requires": {
-            "arr-flatten": "^1.0.1"
+            "arr-flatten": "1.1.0"
           }
         },
         "array-unique": {
@@ -200,9 +200,9 @@
           "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "dev": true,
           "requires": {
-            "expand-range": "^1.8.1",
-            "preserve": "^0.2.0",
-            "repeat-element": "^1.1.2"
+            "expand-range": "1.8.2",
+            "preserve": "0.2.0",
+            "repeat-element": "1.1.2"
           }
         },
         "expand-brackets": {
@@ -211,7 +211,7 @@
           "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "dev": true,
           "requires": {
-            "is-posix-bracket": "^0.1.0"
+            "is-posix-bracket": "0.1.1"
           }
         },
         "extglob": {
@@ -220,7 +220,7 @@
           "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "dev": true,
           "requires": {
-            "is-extglob": "^1.0.0"
+            "is-extglob": "1.0.0"
           }
         },
         "is-extglob": {
@@ -235,7 +235,7 @@
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
           "requires": {
-            "is-extglob": "^1.0.0"
+            "is-extglob": "1.0.0"
           }
         },
         "kind-of": {
@@ -244,7 +244,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         },
         "micromatch": {
@@ -253,19 +253,19 @@
           "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "dev": true,
           "requires": {
-            "arr-diff": "^2.0.0",
-            "array-unique": "^0.2.1",
-            "braces": "^1.8.2",
-            "expand-brackets": "^0.1.4",
-            "extglob": "^0.3.1",
-            "filename-regex": "^2.0.0",
-            "is-extglob": "^1.0.0",
-            "is-glob": "^2.0.1",
-            "kind-of": "^3.0.2",
-            "normalize-path": "^2.0.1",
-            "object.omit": "^2.0.0",
-            "parse-glob": "^3.0.4",
-            "regex-cache": "^0.4.2"
+            "arr-diff": "2.0.0",
+            "array-unique": "0.2.1",
+            "braces": "1.8.5",
+            "expand-brackets": "0.1.5",
+            "extglob": "0.3.2",
+            "filename-regex": "2.0.1",
+            "is-extglob": "1.0.0",
+            "is-glob": "2.0.1",
+            "kind-of": "3.2.2",
+            "normalize-path": "2.1.1",
+            "object.omit": "2.0.1",
+            "parse-glob": "3.0.4",
+            "regex-cache": "0.4.4"
           }
         }
       }
@@ -276,7 +276,7 @@
       "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
       "dev": true,
       "requires": {
-        "buffer-equal": "^1.0.0"
+        "buffer-equal": "1.0.0"
       }
     },
     "aproba": {
@@ -284,6 +284,123 @@
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
       "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
     },
+    "archiver": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-3.0.0.tgz",
+      "integrity": "sha512-5QeR6Xc5hSA9X1rbQfcuQ6VZuUXOaEdB65Dhmk9duuRJHYif/ZyJfuyJqsQrj34PFjU5emv5/MmfgA8un06onw==",
+      "dev": true,
+      "requires": {
+        "archiver-utils": "2.0.0",
+        "async": "2.6.0",
+        "buffer-crc32": "0.2.13",
+        "glob": "7.1.2",
+        "readable-stream": "2.3.6",
+        "tar-stream": "1.5.5",
+        "zip-stream": "2.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        }
+      }
+    },
+    "archiver-utils": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.0.0.tgz",
+      "integrity": "sha512-JRBgcVvDX4Mwu2RBF8bBaHcQCSxab7afsxAPYDQ5W+19quIPP5CfKE7Ql+UHs9wYvwsaNR8oDuhtf5iqrKmzww==",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "lazystream": "1.0.0",
+        "lodash.assign": "4.2.0",
+        "lodash.defaults": "4.2.0",
+        "lodash.difference": "4.5.0",
+        "lodash.flatten": "4.4.0",
+        "lodash.isplainobject": "4.0.6",
+        "lodash.toarray": "4.4.0",
+        "lodash.union": "4.6.0",
+        "normalize-path": "3.0.0",
+        "readable-stream": "2.3.6"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        }
+      }
+    },
     "archy": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
@@ -295,8 +412,8 @@
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
       "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
       "requires": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
+        "delegates": "1.0.0",
+        "readable-stream": "2.3.6"
       },
       "dependencies": {
         "isarray": {
@@ -314,13 +431,13 @@
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -328,7 +445,7 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         }
       }
@@ -339,7 +456,7 @@
       "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=",
       "dev": true,
       "requires": {
-        "sprintf-js": "~1.0.2"
+        "sprintf-js": "1.0.3"
       }
     },
     "arr-diff": {
@@ -354,7 +471,7 @@
       "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
       "dev": true,
       "requires": {
-        "make-iterator": "^1.0.0"
+        "make-iterator": "1.0.1"
       }
     },
     "arr-flatten": {
@@ -369,7 +486,7 @@
       "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
       "dev": true,
       "requires": {
-        "make-iterator": "^1.0.0"
+        "make-iterator": "1.0.1"
       }
     },
     "arr-union": {
@@ -401,8 +518,8 @@
       "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
       "dev": true,
       "requires": {
-        "array-slice": "^1.0.0",
-        "is-number": "^4.0.0"
+        "array-slice": "1.1.0",
+        "is-number": "4.0.0"
       },
       "dependencies": {
         "is-number": {
@@ -419,7 +536,7 @@
       "integrity": "sha1-eqdwc/7FZd2rJJP1+IGF9ASp0zY=",
       "dev": true,
       "requires": {
-        "is-number": "^4.0.0"
+        "is-number": "4.0.0"
       },
       "dependencies": {
         "is-number": {
@@ -442,9 +559,9 @@
       "integrity": "sha1-5MBTVkU/VvU1EqfR1hI/LFTAqIo=",
       "dev": true,
       "requires": {
-        "default-compare": "^1.0.0",
-        "get-value": "^2.0.6",
-        "kind-of": "^5.0.2"
+        "default-compare": "1.0.0",
+        "get-value": "2.0.6",
+        "kind-of": "5.1.0"
       },
       "dependencies": {
         "kind-of": {
@@ -461,7 +578,7 @@
       "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
       "dev": true,
       "requires": {
-        "array-uniq": "^1.0.1"
+        "array-uniq": "1.0.3"
       }
     },
     "array-uniq": {
@@ -487,13 +604,13 @@
       "resolved": "https://registry.npmjs.org/asar/-/asar-0.14.3.tgz",
       "integrity": "sha512-+hNnVVDmYbv05We/a9knj/98w171+A94A9DNHj+3kXUr3ENTQoSEcfbJRvBBRHyOh4vukBYWujmHvvaMmQoQbg==",
       "requires": {
-        "chromium-pickle-js": "^0.2.0",
-        "commander": "^2.9.0",
-        "cuint": "^0.2.1",
-        "glob": "^6.0.4",
-        "minimatch": "^3.0.3",
-        "mkdirp": "^0.5.0",
-        "mksnapshot": "^0.3.0",
+        "chromium-pickle-js": "0.2.0",
+        "commander": "2.16.0",
+        "cuint": "0.2.2",
+        "glob": "6.0.4",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "mksnapshot": "0.3.1",
         "tmp": "0.0.28"
       },
       "dependencies": {
@@ -502,11 +619,11 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
           "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
           "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
           }
         },
         "tmp": {
@@ -514,7 +631,7 @@
           "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz",
           "integrity": "sha1-Fyc1t/YU6nrzlmT6hM8N5OUV0SA=",
           "requires": {
-            "os-tmpdir": "~1.0.1"
+            "os-tmpdir": "1.0.2"
           }
         }
       }
@@ -530,9 +647,9 @@
       "integrity": "sha1-ucK/WAXx5kqt7tbfOiv6+1pz9aA=",
       "dev": true,
       "requires": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
+        "bn.js": "4.11.8",
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1"
       }
     },
     "assert": {
@@ -578,7 +695,7 @@
       "integrity": "sha1-YaKau2/MAm/qd+VtHG7FOnlZUfQ=",
       "dev": true,
       "requires": {
-        "lodash": "^4.14.0"
+        "lodash": "4.17.11"
       }
     },
     "async-done": {
@@ -587,10 +704,10 @@
       "integrity": "sha1-FLe3Nme4ZMjwK1slP8nG7dt3fz4=",
       "dev": true,
       "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.2",
-        "process-nextick-args": "^1.0.7",
-        "stream-exhaust": "^1.0.1"
+        "end-of-stream": "1.4.1",
+        "once": "1.4.0",
+        "process-nextick-args": "1.0.7",
+        "stream-exhaust": "1.0.2"
       }
     },
     "async-each": {
@@ -610,7 +727,7 @@
       "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
       "dev": true,
       "requires": {
-        "async-done": "^1.2.2"
+        "async-done": "1.3.1"
       }
     },
     "asynckit": {
@@ -630,12 +747,12 @@
       "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
       "dev": true,
       "requires": {
-        "browserslist": "^1.7.6",
-        "caniuse-db": "^1.0.30000634",
-        "normalize-range": "^0.1.2",
-        "num2fraction": "^1.2.2",
-        "postcss": "^5.2.16",
-        "postcss-value-parser": "^3.2.3"
+        "browserslist": "1.7.7",
+        "caniuse-db": "1.0.30000862",
+        "normalize-range": "0.1.2",
+        "num2fraction": "1.2.2",
+        "postcss": "5.2.18",
+        "postcss-value-parser": "3.3.0"
       },
       "dependencies": {
         "browserslist": {
@@ -644,8 +761,8 @@
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
           "dev": true,
           "requires": {
-            "caniuse-db": "^1.0.30000639",
-            "electron-to-chromium": "^1.2.7"
+            "caniuse-db": "1.0.30000862",
+            "electron-to-chromium": "1.3.51"
           }
         }
       }
@@ -666,9 +783,9 @@
       "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
       "dev": true,
       "requires": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
+        "chalk": "1.1.3",
+        "esutils": "2.0.2",
+        "js-tokens": "3.0.2"
       }
     },
     "babel-core": {
@@ -677,25 +794,25 @@
       "integrity": "sha1-suLwnjQtDwyI4vAuBneUEl51wgc=",
       "dev": true,
       "requires": {
-        "babel-code-frame": "^6.26.0",
-        "babel-generator": "^6.26.0",
-        "babel-helpers": "^6.24.1",
-        "babel-messages": "^6.23.0",
-        "babel-register": "^6.26.0",
-        "babel-runtime": "^6.26.0",
-        "babel-template": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "convert-source-map": "^1.5.1",
-        "debug": "^2.6.9",
-        "json5": "^0.5.1",
-        "lodash": "^4.17.4",
-        "minimatch": "^3.0.4",
-        "path-is-absolute": "^1.0.1",
-        "private": "^0.1.8",
-        "slash": "^1.0.0",
-        "source-map": "^0.5.7"
+        "babel-code-frame": "6.26.0",
+        "babel-generator": "6.26.1",
+        "babel-helpers": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-register": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "convert-source-map": "1.5.1",
+        "debug": "2.6.9",
+        "json5": "0.5.1",
+        "lodash": "4.17.11",
+        "minimatch": "3.0.4",
+        "path-is-absolute": "1.0.1",
+        "private": "0.1.8",
+        "slash": "1.0.0",
+        "source-map": "0.5.7"
       }
     },
     "babel-generator": {
@@ -704,14 +821,14 @@
       "integrity": "sha1-GERAjTuPDTWkBOp6wYDwh6YBvZA=",
       "dev": true,
       "requires": {
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "detect-indent": "^4.0.0",
-        "jsesc": "^1.3.0",
-        "lodash": "^4.17.4",
-        "source-map": "^0.5.7",
-        "trim-right": "^1.0.1"
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "detect-indent": "4.0.0",
+        "jsesc": "1.3.0",
+        "lodash": "4.17.11",
+        "source-map": "0.5.7",
+        "trim-right": "1.0.1"
       }
     },
     "babel-helper-builder-binary-assignment-operator-visitor": {
@@ -720,9 +837,9 @@
       "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
       "dev": true,
       "requires": {
-        "babel-helper-explode-assignable-expression": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-helper-explode-assignable-expression": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-helper-builder-react-jsx": {
@@ -731,9 +848,9 @@
       "integrity": "sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "esutils": "^2.0.2"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "esutils": "2.0.2"
       }
     },
     "babel-helper-call-delegate": {
@@ -742,10 +859,10 @@
       "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
       "dev": true,
       "requires": {
-        "babel-helper-hoist-variables": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+        "babel-helper-hoist-variables": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-helper-define-map": {
@@ -754,10 +871,10 @@
       "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "^6.24.1",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "lodash": "^4.17.4"
+        "babel-helper-function-name": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "lodash": "4.17.11"
       }
     },
     "babel-helper-explode-assignable-expression": {
@@ -766,9 +883,9 @@
       "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-helper-function-name": {
@@ -777,11 +894,11 @@
       "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
       "dev": true,
       "requires": {
-        "babel-helper-get-function-arity": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+        "babel-helper-get-function-arity": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-helper-get-function-arity": {
@@ -790,8 +907,8 @@
       "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-helper-hoist-variables": {
@@ -800,8 +917,8 @@
       "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-helper-optimise-call-expression": {
@@ -810,8 +927,8 @@
       "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-helper-regex": {
@@ -820,9 +937,9 @@
       "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "lodash": "^4.17.4"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "lodash": "4.17.11"
       }
     },
     "babel-helper-remap-async-to-generator": {
@@ -831,11 +948,11 @@
       "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+        "babel-helper-function-name": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-helper-replace-supers": {
@@ -844,12 +961,12 @@
       "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
       "dev": true,
       "requires": {
-        "babel-helper-optimise-call-expression": "^6.24.1",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+        "babel-helper-optimise-call-expression": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-helpers": {
@@ -858,8 +975,8 @@
       "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
       }
     },
     "babel-loader": {
@@ -868,9 +985,9 @@
       "integrity": "sha1-4+4M1zlKpVfgE7AtPkkr/QeqbWg=",
       "dev": true,
       "requires": {
-        "find-cache-dir": "^1.0.0",
-        "loader-utils": "^1.0.2",
-        "mkdirp": "^0.5.1"
+        "find-cache-dir": "1.0.0",
+        "loader-utils": "1.1.0",
+        "mkdirp": "0.5.1"
       }
     },
     "babel-messages": {
@@ -879,7 +996,7 @@
       "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-check-es2015-constants": {
@@ -888,7 +1005,7 @@
       "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-syntax-async-functions": {
@@ -927,9 +1044,9 @@
       "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
       "dev": true,
       "requires": {
-        "babel-helper-remap-async-to-generator": "^6.24.1",
-        "babel-plugin-syntax-async-functions": "^6.8.0",
-        "babel-runtime": "^6.22.0"
+        "babel-helper-remap-async-to-generator": "6.24.1",
+        "babel-plugin-syntax-async-functions": "6.13.0",
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-arrow-functions": {
@@ -938,7 +1055,7 @@
       "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-block-scoped-functions": {
@@ -947,7 +1064,7 @@
       "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-block-scoping": {
@@ -956,11 +1073,11 @@
       "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-template": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "lodash": "^4.17.4"
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "lodash": "4.17.11"
       }
     },
     "babel-plugin-transform-es2015-classes": {
@@ -969,15 +1086,15 @@
       "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
       "dev": true,
       "requires": {
-        "babel-helper-define-map": "^6.24.1",
-        "babel-helper-function-name": "^6.24.1",
-        "babel-helper-optimise-call-expression": "^6.24.1",
-        "babel-helper-replace-supers": "^6.24.1",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+        "babel-helper-define-map": "6.26.0",
+        "babel-helper-function-name": "6.24.1",
+        "babel-helper-optimise-call-expression": "6.24.1",
+        "babel-helper-replace-supers": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-computed-properties": {
@@ -986,8 +1103,8 @@
       "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-destructuring": {
@@ -996,7 +1113,7 @@
       "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-duplicate-keys": {
@@ -1005,8 +1122,8 @@
       "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-for-of": {
@@ -1015,7 +1132,7 @@
       "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-function-name": {
@@ -1024,9 +1141,9 @@
       "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
       "dev": true,
       "requires": {
-        "babel-helper-function-name": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-helper-function-name": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-literals": {
@@ -1035,7 +1152,7 @@
       "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-modules-amd": {
@@ -1044,9 +1161,9 @@
       "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+        "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-modules-commonjs": {
@@ -1055,10 +1172,10 @@
       "integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-strict-mode": "^6.24.1",
-        "babel-runtime": "^6.26.0",
-        "babel-template": "^6.26.0",
-        "babel-types": "^6.26.0"
+        "babel-plugin-transform-strict-mode": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-modules-systemjs": {
@@ -1067,9 +1184,9 @@
       "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
       "dev": true,
       "requires": {
-        "babel-helper-hoist-variables": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+        "babel-helper-hoist-variables": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-modules-umd": {
@@ -1078,9 +1195,9 @@
       "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-object-super": {
@@ -1089,8 +1206,8 @@
       "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
       "dev": true,
       "requires": {
-        "babel-helper-replace-supers": "^6.24.1",
-        "babel-runtime": "^6.22.0"
+        "babel-helper-replace-supers": "6.24.1",
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-parameters": {
@@ -1099,12 +1216,12 @@
       "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
       "dev": true,
       "requires": {
-        "babel-helper-call-delegate": "^6.24.1",
-        "babel-helper-get-function-arity": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+        "babel-helper-call-delegate": "6.24.1",
+        "babel-helper-get-function-arity": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-shorthand-properties": {
@@ -1113,8 +1230,8 @@
       "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-spread": {
@@ -1123,7 +1240,7 @@
       "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-sticky-regex": {
@@ -1132,9 +1249,9 @@
       "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
       "dev": true,
       "requires": {
-        "babel-helper-regex": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-helper-regex": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-template-literals": {
@@ -1143,7 +1260,7 @@
       "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-typeof-symbol": {
@@ -1152,7 +1269,7 @@
       "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-es2015-unicode-regex": {
@@ -1161,9 +1278,9 @@
       "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
       "dev": true,
       "requires": {
-        "babel-helper-regex": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "regexpu-core": "^2.0.0"
+        "babel-helper-regex": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "regexpu-core": "2.0.0"
       }
     },
     "babel-plugin-transform-exponentiation-operator": {
@@ -1172,9 +1289,9 @@
       "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
       "dev": true,
       "requires": {
-        "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1",
-        "babel-plugin-syntax-exponentiation-operator": "^6.8.0",
-        "babel-runtime": "^6.22.0"
+        "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1",
+        "babel-plugin-syntax-exponentiation-operator": "6.13.0",
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-flow-strip-types": {
@@ -1183,8 +1300,8 @@
       "integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-flow": "^6.18.0",
-        "babel-runtime": "^6.22.0"
+        "babel-plugin-syntax-flow": "6.18.0",
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-react-display-name": {
@@ -1193,7 +1310,7 @@
       "integrity": "sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-react-jsx": {
@@ -1202,9 +1319,9 @@
       "integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=",
       "dev": true,
       "requires": {
-        "babel-helper-builder-react-jsx": "^6.24.1",
-        "babel-plugin-syntax-jsx": "^6.8.0",
-        "babel-runtime": "^6.22.0"
+        "babel-helper-builder-react-jsx": "6.26.0",
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-react-jsx-self": {
@@ -1213,8 +1330,8 @@
       "integrity": "sha1-322AqdomEqEh5t3XVYvL7PBuY24=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-jsx": "^6.8.0",
-        "babel-runtime": "^6.22.0"
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-react-jsx-source": {
@@ -1223,8 +1340,8 @@
       "integrity": "sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-jsx": "^6.8.0",
-        "babel-runtime": "^6.22.0"
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-plugin-transform-regenerator": {
@@ -1233,7 +1350,7 @@
       "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
       "dev": true,
       "requires": {
-        "regenerator-transform": "^0.10.0"
+        "regenerator-transform": "0.10.1"
       }
     },
     "babel-plugin-transform-strict-mode": {
@@ -1242,8 +1359,8 @@
       "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
       }
     },
     "babel-preset-env": {
@@ -1252,36 +1369,36 @@
       "integrity": "sha1-3qefpOvriDzTXasH4mDBycBN93o=",
       "dev": true,
       "requires": {
-        "babel-plugin-check-es2015-constants": "^6.22.0",
-        "babel-plugin-syntax-trailing-function-commas": "^6.22.0",
-        "babel-plugin-transform-async-to-generator": "^6.22.0",
-        "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
-        "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
-        "babel-plugin-transform-es2015-block-scoping": "^6.23.0",
-        "babel-plugin-transform-es2015-classes": "^6.23.0",
-        "babel-plugin-transform-es2015-computed-properties": "^6.22.0",
-        "babel-plugin-transform-es2015-destructuring": "^6.23.0",
-        "babel-plugin-transform-es2015-duplicate-keys": "^6.22.0",
-        "babel-plugin-transform-es2015-for-of": "^6.23.0",
-        "babel-plugin-transform-es2015-function-name": "^6.22.0",
-        "babel-plugin-transform-es2015-literals": "^6.22.0",
-        "babel-plugin-transform-es2015-modules-amd": "^6.22.0",
-        "babel-plugin-transform-es2015-modules-commonjs": "^6.23.0",
-        "babel-plugin-transform-es2015-modules-systemjs": "^6.23.0",
-        "babel-plugin-transform-es2015-modules-umd": "^6.23.0",
-        "babel-plugin-transform-es2015-object-super": "^6.22.0",
-        "babel-plugin-transform-es2015-parameters": "^6.23.0",
-        "babel-plugin-transform-es2015-shorthand-properties": "^6.22.0",
-        "babel-plugin-transform-es2015-spread": "^6.22.0",
-        "babel-plugin-transform-es2015-sticky-regex": "^6.22.0",
-        "babel-plugin-transform-es2015-template-literals": "^6.22.0",
-        "babel-plugin-transform-es2015-typeof-symbol": "^6.23.0",
-        "babel-plugin-transform-es2015-unicode-regex": "^6.22.0",
-        "babel-plugin-transform-exponentiation-operator": "^6.22.0",
-        "babel-plugin-transform-regenerator": "^6.22.0",
-        "browserslist": "^3.2.6",
-        "invariant": "^2.2.2",
-        "semver": "^5.3.0"
+        "babel-plugin-check-es2015-constants": "6.22.0",
+        "babel-plugin-syntax-trailing-function-commas": "6.22.0",
+        "babel-plugin-transform-async-to-generator": "6.24.1",
+        "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "6.26.0",
+        "babel-plugin-transform-es2015-classes": "6.24.1",
+        "babel-plugin-transform-es2015-computed-properties": "6.24.1",
+        "babel-plugin-transform-es2015-destructuring": "6.23.0",
+        "babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
+        "babel-plugin-transform-es2015-for-of": "6.23.0",
+        "babel-plugin-transform-es2015-function-name": "6.24.1",
+        "babel-plugin-transform-es2015-literals": "6.22.0",
+        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
+        "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
+        "babel-plugin-transform-es2015-modules-systemjs": "6.24.1",
+        "babel-plugin-transform-es2015-modules-umd": "6.24.1",
+        "babel-plugin-transform-es2015-object-super": "6.24.1",
+        "babel-plugin-transform-es2015-parameters": "6.24.1",
+        "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
+        "babel-plugin-transform-es2015-spread": "6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
+        "babel-plugin-transform-es2015-template-literals": "6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
+        "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
+        "babel-plugin-transform-exponentiation-operator": "6.24.1",
+        "babel-plugin-transform-regenerator": "6.26.0",
+        "browserslist": "3.2.8",
+        "invariant": "2.2.2",
+        "semver": "5.5.0"
       }
     },
     "babel-preset-es2015": {
@@ -1290,30 +1407,30 @@
       "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
       "dev": true,
       "requires": {
-        "babel-plugin-check-es2015-constants": "^6.22.0",
-        "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
-        "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
-        "babel-plugin-transform-es2015-block-scoping": "^6.24.1",
-        "babel-plugin-transform-es2015-classes": "^6.24.1",
-        "babel-plugin-transform-es2015-computed-properties": "^6.24.1",
-        "babel-plugin-transform-es2015-destructuring": "^6.22.0",
-        "babel-plugin-transform-es2015-duplicate-keys": "^6.24.1",
-        "babel-plugin-transform-es2015-for-of": "^6.22.0",
-        "babel-plugin-transform-es2015-function-name": "^6.24.1",
-        "babel-plugin-transform-es2015-literals": "^6.22.0",
-        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
-        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
-        "babel-plugin-transform-es2015-modules-systemjs": "^6.24.1",
-        "babel-plugin-transform-es2015-modules-umd": "^6.24.1",
-        "babel-plugin-transform-es2015-object-super": "^6.24.1",
-        "babel-plugin-transform-es2015-parameters": "^6.24.1",
-        "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1",
-        "babel-plugin-transform-es2015-spread": "^6.22.0",
-        "babel-plugin-transform-es2015-sticky-regex": "^6.24.1",
-        "babel-plugin-transform-es2015-template-literals": "^6.22.0",
-        "babel-plugin-transform-es2015-typeof-symbol": "^6.22.0",
-        "babel-plugin-transform-es2015-unicode-regex": "^6.24.1",
-        "babel-plugin-transform-regenerator": "^6.24.1"
+        "babel-plugin-check-es2015-constants": "6.22.0",
+        "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "6.26.0",
+        "babel-plugin-transform-es2015-classes": "6.24.1",
+        "babel-plugin-transform-es2015-computed-properties": "6.24.1",
+        "babel-plugin-transform-es2015-destructuring": "6.23.0",
+        "babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
+        "babel-plugin-transform-es2015-for-of": "6.23.0",
+        "babel-plugin-transform-es2015-function-name": "6.24.1",
+        "babel-plugin-transform-es2015-literals": "6.22.0",
+        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
+        "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
+        "babel-plugin-transform-es2015-modules-systemjs": "6.24.1",
+        "babel-plugin-transform-es2015-modules-umd": "6.24.1",
+        "babel-plugin-transform-es2015-object-super": "6.24.1",
+        "babel-plugin-transform-es2015-parameters": "6.24.1",
+        "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
+        "babel-plugin-transform-es2015-spread": "6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
+        "babel-plugin-transform-es2015-template-literals": "6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
+        "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
+        "babel-plugin-transform-regenerator": "6.26.0"
       }
     },
     "babel-preset-flow": {
@@ -1322,7 +1439,7 @@
       "integrity": "sha1-5xIYiHCFrpoktb5Baa/7WZgWxJ0=",
       "dev": true,
       "requires": {
-        "babel-plugin-transform-flow-strip-types": "^6.22.0"
+        "babel-plugin-transform-flow-strip-types": "6.22.0"
       }
     },
     "babel-preset-react": {
@@ -1331,12 +1448,12 @@
       "integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=",
       "dev": true,
       "requires": {
-        "babel-plugin-syntax-jsx": "^6.3.13",
-        "babel-plugin-transform-react-display-name": "^6.23.0",
-        "babel-plugin-transform-react-jsx": "^6.24.1",
-        "babel-plugin-transform-react-jsx-self": "^6.22.0",
-        "babel-plugin-transform-react-jsx-source": "^6.22.0",
-        "babel-preset-flow": "^6.23.0"
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "babel-plugin-transform-react-display-name": "6.25.0",
+        "babel-plugin-transform-react-jsx": "6.24.1",
+        "babel-plugin-transform-react-jsx-self": "6.22.0",
+        "babel-plugin-transform-react-jsx-source": "6.22.0",
+        "babel-preset-flow": "6.23.0"
       }
     },
     "babel-register": {
@@ -1345,13 +1462,13 @@
       "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
       "dev": true,
       "requires": {
-        "babel-core": "^6.26.0",
-        "babel-runtime": "^6.26.0",
-        "core-js": "^2.5.0",
-        "home-or-tmp": "^2.0.0",
-        "lodash": "^4.17.4",
-        "mkdirp": "^0.5.1",
-        "source-map-support": "^0.4.15"
+        "babel-core": "6.26.3",
+        "babel-runtime": "6.26.0",
+        "core-js": "2.5.3",
+        "home-or-tmp": "2.0.0",
+        "lodash": "4.17.11",
+        "mkdirp": "0.5.1",
+        "source-map-support": "0.4.18"
       }
     },
     "babel-runtime": {
@@ -1360,8 +1477,8 @@
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
       "dev": true,
       "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
+        "core-js": "2.5.3",
+        "regenerator-runtime": "0.11.1"
       }
     },
     "babel-template": {
@@ -1370,11 +1487,11 @@
       "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "lodash": "^4.17.4"
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "lodash": "4.17.11"
       }
     },
     "babel-traverse": {
@@ -1383,15 +1500,15 @@
       "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
       "dev": true,
       "requires": {
-        "babel-code-frame": "^6.26.0",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "debug": "^2.6.8",
-        "globals": "^9.18.0",
-        "invariant": "^2.2.2",
-        "lodash": "^4.17.4"
+        "babel-code-frame": "6.26.0",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "debug": "2.6.9",
+        "globals": "9.18.0",
+        "invariant": "2.2.2",
+        "lodash": "4.17.11"
       }
     },
     "babel-types": {
@@ -1400,10 +1517,10 @@
       "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.26.0",
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.4",
-        "to-fast-properties": "^1.0.3"
+        "babel-runtime": "6.26.0",
+        "esutils": "2.0.2",
+        "lodash": "4.17.11",
+        "to-fast-properties": "1.0.3"
       }
     },
     "babylon": {
@@ -1418,15 +1535,15 @@
       "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
       "dev": true,
       "requires": {
-        "arr-filter": "^1.1.1",
-        "arr-flatten": "^1.0.1",
-        "arr-map": "^2.0.0",
-        "array-each": "^1.0.0",
-        "array-initial": "^1.0.0",
-        "array-last": "^1.1.1",
-        "async-done": "^1.2.2",
-        "async-settle": "^1.0.0",
-        "now-and-later": "^2.0.0"
+        "arr-filter": "1.1.2",
+        "arr-flatten": "1.1.0",
+        "arr-map": "2.0.2",
+        "array-each": "1.0.1",
+        "array-initial": "1.1.0",
+        "array-last": "1.3.0",
+        "async-done": "1.3.1",
+        "async-settle": "1.0.0",
+        "now-and-later": "2.0.0"
       }
     },
     "balanced-match": {
@@ -1440,13 +1557,13 @@
       "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=",
       "dev": true,
       "requires": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
+        "cache-base": "1.0.1",
+        "class-utils": "0.3.6",
+        "component-emitter": "1.2.1",
+        "define-property": "1.0.0",
+        "isobject": "3.0.1",
+        "mixin-deep": "1.3.0",
+        "pascalcase": "0.1.1"
       }
     },
     "base64-js": {
@@ -1461,7 +1578,7 @@
       "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
       "optional": true,
       "requires": {
-        "tweetnacl": "^0.14.3"
+        "tweetnacl": "0.14.5"
       }
     },
     "beeper": {
@@ -1481,8 +1598,8 @@
       "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
       "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
       "requires": {
-        "buffers": "~0.1.1",
-        "chainsaw": "~0.1.0"
+        "buffers": "0.1.1",
+        "chainsaw": "0.1.0"
       }
     },
     "binary-extensions": {
@@ -1496,7 +1613,7 @@
       "resolved": "https://registry.npmjs.org/binary-search-tree/-/binary-search-tree-0.2.5.tgz",
       "integrity": "sha1-fbs7IQ/coIJFDa0jNMMErzm9x4Q=",
       "requires": {
-        "underscore": "~1.4.4"
+        "underscore": "1.4.4"
       }
     },
     "bl": {
@@ -1504,8 +1621,8 @@
       "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
       "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
       "requires": {
-        "readable-stream": "^2.3.5",
-        "safe-buffer": "^5.1.1"
+        "readable-stream": "2.3.5",
+        "safe-buffer": "5.1.1"
       },
       "dependencies": {
         "isarray": {
@@ -1523,13 +1640,13 @@
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
           "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.0.3",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.0.3",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -1537,7 +1654,7 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
           "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         }
       }
@@ -1547,7 +1664,7 @@
       "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
       "requires": {
-        "inherits": "~2.0.0"
+        "inherits": "2.0.3"
       }
     },
     "bluebird": {
@@ -1573,7 +1690,7 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
       "requires": {
-        "balanced-match": "^1.0.0",
+        "balanced-match": "1.0.0",
         "concat-map": "0.0.1"
       }
     },
@@ -1583,18 +1700,18 @@
       "integrity": "sha1-cIbJE7TloI2+N6wO5qJQDEumkbs=",
       "dev": true,
       "requires": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "kind-of": "^6.0.2",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
+        "arr-flatten": "1.1.0",
+        "array-unique": "0.3.2",
+        "define-property": "1.0.0",
+        "extend-shallow": "2.0.1",
+        "fill-range": "4.0.0",
+        "isobject": "3.0.1",
+        "kind-of": "6.0.2",
+        "repeat-element": "1.1.2",
+        "snapdragon": "0.8.1",
+        "snapdragon-node": "2.1.1",
+        "split-string": "3.1.0",
+        "to-regex": "3.0.1"
       }
     },
     "brorand": {
@@ -1609,12 +1726,12 @@
       "integrity": "sha1-Mmc0ZC9APavDADIJhTu3CtQo70g=",
       "dev": true,
       "requires": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "buffer-xor": "1.0.3",
+        "cipher-base": "1.0.4",
+        "create-hash": "1.2.0",
+        "evp_bytestokey": "1.0.3",
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.1"
       }
     },
     "browserify-cipher": {
@@ -1623,9 +1740,9 @@
       "integrity": "sha1-jWR0wbhwv9q807z8wZNKEOlPFfA=",
       "dev": true,
       "requires": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
+        "browserify-aes": "1.2.0",
+        "browserify-des": "1.0.1",
+        "evp_bytestokey": "1.0.3"
       }
     },
     "browserify-des": {
@@ -1634,9 +1751,9 @@
       "integrity": "sha512-zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw==",
       "dev": true,
       "requires": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1"
+        "cipher-base": "1.0.4",
+        "des.js": "1.0.0",
+        "inherits": "2.0.3"
       }
     },
     "browserify-rsa": {
@@ -1645,8 +1762,8 @@
       "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "randombytes": "^2.0.1"
+        "bn.js": "4.11.8",
+        "randombytes": "2.0.6"
       }
     },
     "browserify-sign": {
@@ -1655,13 +1772,13 @@
       "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.1",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.2",
-        "elliptic": "^6.0.0",
-        "inherits": "^2.0.1",
-        "parse-asn1": "^5.0.0"
+        "bn.js": "4.11.8",
+        "browserify-rsa": "4.0.1",
+        "create-hash": "1.2.0",
+        "create-hmac": "1.1.7",
+        "elliptic": "6.4.0",
+        "inherits": "2.0.3",
+        "parse-asn1": "5.1.1"
       }
     },
     "browserify-zlib": {
@@ -1670,7 +1787,7 @@
       "integrity": "sha1-KGlFnZqjviRf6P4sofRuLn9U1z8=",
       "dev": true,
       "requires": {
-        "pako": "~1.0.5"
+        "pako": "1.0.6"
       }
     },
     "browserslist": {
@@ -1679,8 +1796,8 @@
       "integrity": "sha1-sABTYdZHHw9ZUnl6dvyYXx+Xj8Y=",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30000844",
-        "electron-to-chromium": "^1.3.47"
+        "caniuse-lite": "1.0.30000862",
+        "electron-to-chromium": "1.3.51"
       }
     },
     "buffer": {
@@ -1689,9 +1806,9 @@
       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
       "dev": true,
       "requires": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
+        "base64-js": "1.3.0",
+        "ieee754": "1.1.12",
+        "isarray": "1.0.0"
       },
       "dependencies": {
         "isarray": {
@@ -1702,6 +1819,12 @@
         }
       }
     },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "dev": true
+    },
     "buffer-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
@@ -1742,19 +1865,19 @@
       "integrity": "sha1-ZFI2eZnv+dQYiu/ZoU6dfGomNGA=",
       "dev": true,
       "requires": {
-        "bluebird": "^3.5.1",
-        "chownr": "^1.0.1",
-        "glob": "^7.1.2",
-        "graceful-fs": "^4.1.11",
-        "lru-cache": "^4.1.1",
-        "mississippi": "^2.0.0",
-        "mkdirp": "^0.5.1",
-        "move-concurrently": "^1.0.1",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.2",
-        "ssri": "^5.2.4",
-        "unique-filename": "^1.1.0",
-        "y18n": "^4.0.0"
+        "bluebird": "3.5.1",
+        "chownr": "1.0.1",
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "lru-cache": "4.1.3",
+        "mississippi": "2.0.0",
+        "mkdirp": "0.5.1",
+        "move-concurrently": "1.0.1",
+        "promise-inflight": "1.0.1",
+        "rimraf": "2.6.2",
+        "ssri": "5.3.0",
+        "unique-filename": "1.1.0",
+        "y18n": "4.0.0"
       },
       "dependencies": {
         "lru-cache": {
@@ -1763,8 +1886,8 @@
           "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
           "dev": true,
           "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
+            "pseudomap": "1.0.2",
+            "yallist": "2.1.2"
           }
         },
         "y18n": {
@@ -1781,15 +1904,15 @@
       "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=",
       "dev": true,
       "requires": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
+        "collection-visit": "1.0.0",
+        "component-emitter": "1.2.1",
+        "get-value": "2.0.6",
+        "has-value": "1.0.0",
+        "isobject": "3.0.1",
+        "set-value": "2.0.0",
+        "to-object-path": "0.3.0",
+        "union-value": "1.0.0",
+        "unset-value": "1.0.0"
       }
     },
     "caller-path": {
@@ -1798,7 +1921,7 @@
       "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
       "dev": true,
       "requires": {
-        "callsites": "^0.2.0"
+        "callsites": "0.2.0"
       }
     },
     "callsites": {
@@ -1813,8 +1936,8 @@
       "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
       "dev": true,
       "requires": {
-        "no-case": "^2.2.0",
-        "upper-case": "^1.1.1"
+        "no-case": "2.3.2",
+        "upper-case": "1.1.3"
       }
     },
     "camelcase": {
@@ -1827,8 +1950,8 @@
       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
       "requires": {
-        "camelcase": "^2.0.0",
-        "map-obj": "^1.0.0"
+        "camelcase": "2.1.1",
+        "map-obj": "1.0.1"
       }
     },
     "caniuse-api": {
@@ -1837,10 +1960,10 @@
       "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=",
       "dev": true,
       "requires": {
-        "browserslist": "^1.3.6",
-        "caniuse-db": "^1.0.30000529",
-        "lodash.memoize": "^4.1.2",
-        "lodash.uniq": "^4.5.0"
+        "browserslist": "1.7.7",
+        "caniuse-db": "1.0.30000862",
+        "lodash.memoize": "4.1.2",
+        "lodash.uniq": "4.5.0"
       },
       "dependencies": {
         "browserslist": {
@@ -1849,8 +1972,8 @@
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
           "dev": true,
           "requires": {
-            "caniuse-db": "^1.0.30000639",
-            "electron-to-chromium": "^1.2.7"
+            "caniuse-db": "1.0.30000862",
+            "electron-to-chromium": "1.3.51"
           }
         }
       }
@@ -1878,8 +2001,8 @@
       "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
       "dev": true,
       "requires": {
-        "align-text": "^0.1.3",
-        "lazy-cache": "^1.0.3"
+        "align-text": "0.1.4",
+        "lazy-cache": "1.0.4"
       },
       "dependencies": {
         "lazy-cache": {
@@ -1895,7 +2018,7 @@
       "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
       "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
       "requires": {
-        "traverse": ">=0.3.0 <0.4"
+        "traverse": "0.3.9"
       }
     },
     "chalk": {
@@ -1903,11 +2026,11 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
       "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
       "requires": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
+        "ansi-styles": "2.2.1",
+        "escape-string-regexp": "1.0.5",
+        "has-ansi": "2.0.0",
+        "strip-ansi": "3.0.1",
+        "supports-color": "2.0.0"
       }
     },
     "chardet": {
@@ -1922,18 +2045,18 @@
       "integrity": "sha1-TcZROe6ycUl3c1tqNdBul7SU39c=",
       "dev": true,
       "requires": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.0",
-        "braces": "^2.3.0",
-        "fsevents": "^1.0.0",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.1",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^2.1.1",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.0.0",
-        "upath": "^1.0.0"
+        "anymatch": "2.0.0",
+        "async-each": "1.0.1",
+        "braces": "2.3.1",
+        "fsevents": "1.1.3",
+        "glob-parent": "3.1.0",
+        "inherits": "2.0.3",
+        "is-binary-path": "1.0.1",
+        "is-glob": "4.0.0",
+        "normalize-path": "2.1.1",
+        "path-is-absolute": "1.0.1",
+        "readdirp": "2.1.0",
+        "upath": "1.0.4"
       },
       "dependencies": {
         "anymatch": {
@@ -1942,8 +2065,8 @@
           "integrity": "sha1-vLJLTzeTTZqnrBe0ra+J58du8us=",
           "dev": true,
           "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
+            "micromatch": "3.1.5",
+            "normalize-path": "2.1.1"
           }
         },
         "is-glob": {
@@ -1952,7 +2075,7 @@
           "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
           "dev": true,
           "requires": {
-            "is-extglob": "^2.1.1"
+            "is-extglob": "2.1.1"
           }
         }
       }
@@ -1973,8 +2096,8 @@
       "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.1"
       }
     },
     "circular-json": {
@@ -1989,7 +2112,7 @@
       "integrity": "sha1-TzZ0WzIAhJJVf0ZBLWbVDLmbzlE=",
       "dev": true,
       "requires": {
-        "chalk": "^1.1.3"
+        "chalk": "1.1.3"
       }
     },
     "class-utils": {
@@ -1998,10 +2121,10 @@
       "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=",
       "dev": true,
       "requires": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
+        "arr-union": "3.1.0",
+        "define-property": "0.2.5",
+        "isobject": "3.0.1",
+        "static-extend": "0.1.2"
       },
       "dependencies": {
         "define-property": {
@@ -2010,7 +2133,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         },
         "is-accessor-descriptor": {
@@ -2019,7 +2142,7 @@
           "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           },
           "dependencies": {
             "kind-of": {
@@ -2028,7 +2151,7 @@
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "is-buffer": "1.1.6"
               }
             }
           }
@@ -2039,7 +2162,7 @@
           "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           },
           "dependencies": {
             "kind-of": {
@@ -2048,7 +2171,7 @@
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "is-buffer": "1.1.6"
               }
             }
           }
@@ -2059,9 +2182,9 @@
           "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
+            "is-accessor-descriptor": "0.1.6",
+            "is-data-descriptor": "0.1.4",
+            "kind-of": "5.1.0"
           }
         },
         "kind-of": {
@@ -2078,7 +2201,7 @@
       "integrity": "sha1-Ls3xRaujj1R0DybO/Q/z4D4SXWo=",
       "dev": true,
       "requires": {
-        "source-map": "0.5.x"
+        "source-map": "0.5.7"
       }
     },
     "cli-cursor": {
@@ -2087,7 +2210,7 @@
       "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
       "dev": true,
       "requires": {
-        "restore-cursor": "^2.0.0"
+        "restore-cursor": "2.0.0"
       }
     },
     "cli-spinners": {
@@ -2107,9 +2230,9 @@
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
       "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
       "requires": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wrap-ansi": "^2.0.0"
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "wrap-ansi": "2.1.0"
       }
     },
     "clone": {
@@ -2130,10 +2253,10 @@
       "integrity": "sha1-ANs6Hhc2VnMNEYjD1qztbX6pdxM=",
       "dev": true,
       "requires": {
-        "for-own": "^1.0.0",
-        "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.0",
-        "shallow-clone": "^1.0.0"
+        "for-own": "1.0.0",
+        "is-plain-object": "2.0.4",
+        "kind-of": "6.0.2",
+        "shallow-clone": "1.0.0"
       }
     },
     "clone-stats": {
@@ -2148,9 +2271,9 @@
       "integrity": "sha1-pikNQT8hemEjL5XkWP84QYz7ARc=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "process-nextick-args": "^1.0.6",
-        "through2": "^2.0.1"
+        "inherits": "2.0.3",
+        "process-nextick-args": "1.0.7",
+        "through2": "2.0.3"
       },
       "dependencies": {
         "isarray": {
@@ -2165,13 +2288,13 @@
           "integrity": "sha1-yUbD9H+n2Oq8C2FQ9KEvaaRXQHE=",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.0.3",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.0.3",
+            "util-deprecate": "1.0.2"
           },
           "dependencies": {
             "process-nextick-args": {
@@ -2188,7 +2311,7 @@
           "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         },
         "through2": {
@@ -2197,8 +2320,8 @@
           "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
           "dev": true,
           "requires": {
-            "readable-stream": "^2.1.5",
-            "xtend": "~4.0.1"
+            "readable-stream": "2.3.4",
+            "xtend": "4.0.1"
           }
         },
         "xtend": {
@@ -2220,7 +2343,7 @@
       "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=",
       "dev": true,
       "requires": {
-        "q": "^1.1.2"
+        "q": "1.5.1"
       }
     },
     "code-point-at": {
@@ -2240,9 +2363,9 @@
       "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
       "dev": true,
       "requires": {
-        "arr-map": "^2.0.2",
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
+        "arr-map": "2.0.2",
+        "for-own": "1.0.0",
+        "make-iterator": "1.0.1"
       }
     },
     "collection-visit": {
@@ -2251,8 +2374,8 @@
       "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
       "dev": true,
       "requires": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
+        "map-visit": "1.0.0",
+        "object-visit": "1.0.1"
       }
     },
     "color": {
@@ -2261,9 +2384,9 @@
       "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
       "dev": true,
       "requires": {
-        "clone": "^1.0.2",
-        "color-convert": "^1.3.0",
-        "color-string": "^0.3.0"
+        "clone": "1.0.3",
+        "color-convert": "1.9.2",
+        "color-string": "0.3.0"
       }
     },
     "color-convert": {
@@ -2287,7 +2410,7 @@
       "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
       "dev": true,
       "requires": {
-        "color-name": "^1.0.0"
+        "color-name": "1.1.1"
       }
     },
     "color-support": {
@@ -2302,9 +2425,9 @@
       "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=",
       "dev": true,
       "requires": {
-        "color": "^0.11.0",
+        "color": "0.11.4",
         "css-color-names": "0.0.4",
-        "has": "^1.0.1"
+        "has": "1.0.3"
       }
     },
     "colors": {
@@ -2318,7 +2441,7 @@
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
       "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
       "requires": {
-        "delayed-stream": "~1.0.0"
+        "delayed-stream": "1.0.0"
       }
     },
     "combokeys": {
@@ -2344,6 +2467,56 @@
       "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
       "dev": true
     },
+    "compress-commons": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.2.tgz",
+      "integrity": "sha1-UkqfEJA/OoEzibAiXSfEi7dRiQ8=",
+      "dev": true,
+      "requires": {
+        "buffer-crc32": "0.2.13",
+        "crc32-stream": "2.0.0",
+        "normalize-path": "2.1.1",
+        "readable-stream": "2.3.6"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        }
+      }
+    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -2355,9 +2528,9 @@
       "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.4",
+        "typedarray": "0.0.6"
       },
       "dependencies": {
         "isarray": {
@@ -2378,13 +2551,13 @@
           "integrity": "sha1-yUbD9H+n2Oq8C2FQ9KEvaaRXQHE=",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.0.3",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.0.3",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -2393,7 +2566,7 @@
           "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         }
       }
@@ -2404,8 +2577,8 @@
       "integrity": "sha1-q6CXR9++TD5w52am5BWG4YWfxvI=",
       "dev": true,
       "requires": {
-        "ini": "^1.3.4",
-        "proto-list": "~1.2.1"
+        "ini": "1.3.5",
+        "proto-list": "1.2.4"
       }
     },
     "console-browserify": {
@@ -2414,7 +2587,7 @@
       "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
       "dev": true,
       "requires": {
-        "date-now": "^0.1.4"
+        "date-now": "0.1.4"
       }
     },
     "console-control-strings": {
@@ -2428,7 +2601,7 @@
       "integrity": "sha1-WiUEe8dvcwcmZ8jLUsmJiI9JTGM=",
       "dev": true,
       "requires": {
-        "bluebird": "^3.1.1"
+        "bluebird": "3.5.1"
       }
     },
     "constants-browserify": {
@@ -2449,12 +2622,12 @@
       "integrity": "sha1-kilzmMrjSTf8r9bsgTnBgFHwteA=",
       "dev": true,
       "requires": {
-        "aproba": "^1.1.1",
-        "fs-write-stream-atomic": "^1.0.8",
-        "iferr": "^0.1.5",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.0"
+        "aproba": "1.2.0",
+        "fs-write-stream-atomic": "1.0.10",
+        "iferr": "0.1.5",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2",
+        "run-queue": "1.0.3"
       }
     },
     "copy-descriptor": {
@@ -2469,8 +2642,8 @@
       "integrity": "sha1-k7scrfr9MdpbuKnUtB9HHsOnLf4=",
       "dev": true,
       "requires": {
-        "each-props": "^1.3.0",
-        "is-plain-object": "^2.0.1"
+        "each-props": "1.3.2",
+        "is-plain-object": "2.0.4"
       }
     },
     "core-js": {
@@ -2490,13 +2663,13 @@
       "integrity": "sha1-YXPOvVb6wELB9DkO33r2wHx8uJI=",
       "dev": true,
       "requires": {
-        "is-directory": "^0.3.1",
-        "js-yaml": "^3.4.3",
-        "minimist": "^1.2.0",
-        "object-assign": "^4.1.0",
-        "os-homedir": "^1.0.1",
-        "parse-json": "^2.2.0",
-        "require-from-string": "^1.1.0"
+        "is-directory": "0.3.1",
+        "js-yaml": "3.7.0",
+        "minimist": "1.2.0",
+        "object-assign": "4.1.1",
+        "os-homedir": "1.0.2",
+        "parse-json": "2.2.0",
+        "require-from-string": "1.2.1"
       },
       "dependencies": {
         "minimist": {
@@ -2507,14 +2680,83 @@
         }
       }
     },
+    "crc": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz",
+      "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==",
+      "dev": true,
+      "requires": {
+        "buffer": "5.2.1"
+      },
+      "dependencies": {
+        "buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
+          "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
+          "dev": true,
+          "requires": {
+            "base64-js": "1.3.0",
+            "ieee754": "1.1.12"
+          }
+        }
+      }
+    },
+    "crc32-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-2.0.0.tgz",
+      "integrity": "sha1-483TtN8xaN10494/u8t7KX/pCPQ=",
+      "dev": true,
+      "requires": {
+        "crc": "3.8.0",
+        "readable-stream": "2.3.6"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        }
+      }
+    },
     "create-ecdh": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
       "integrity": "sha1-yREbbzMEXEaX8UR4f5JUzcd8Rf8=",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.0.0"
+        "bn.js": "4.11.8",
+        "elliptic": "6.4.0"
       }
     },
     "create-hash": {
@@ -2523,11 +2765,11 @@
       "integrity": "sha1-iJB4rxGmN1a8+1m9IhmWvjqe8ZY=",
       "dev": true,
       "requires": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
+        "cipher-base": "1.0.4",
+        "inherits": "2.0.3",
+        "md5.js": "1.3.4",
+        "ripemd160": "2.0.2",
+        "sha.js": "2.4.11"
       }
     },
     "create-hmac": {
@@ -2536,12 +2778,12 @@
       "integrity": "sha1-aRcMeLOrlXFHsriwRXLkfq0iQ/8=",
       "dev": true,
       "requires": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
+        "cipher-base": "1.0.4",
+        "create-hash": "1.2.0",
+        "inherits": "2.0.3",
+        "ripemd160": "2.0.2",
+        "safe-buffer": "5.1.1",
+        "sha.js": "2.4.11"
       }
     },
     "cross-spawn": {
@@ -2550,9 +2792,9 @@
       "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
       "dev": true,
       "requires": {
-        "lru-cache": "^4.0.1",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
+        "lru-cache": "4.1.3",
+        "shebang-command": "1.2.0",
+        "which": "1.3.0"
       },
       "dependencies": {
         "lru-cache": {
@@ -2561,8 +2803,8 @@
           "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
           "dev": true,
           "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
+            "pseudomap": "1.0.2",
+            "yallist": "2.1.2"
           }
         }
       }
@@ -2573,22 +2815,21 @@
       "integrity": "sha1-OWz58xN/A+S45TLFj2mCVOAPgOw=",
       "dev": true,
       "requires": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
+        "browserify-cipher": "1.0.1",
+        "browserify-sign": "4.0.4",
+        "create-ecdh": "4.0.3",
+        "create-hash": "1.2.0",
+        "create-hmac": "1.1.7",
+        "diffie-hellman": "5.0.3",
+        "inherits": "2.0.3",
+        "pbkdf2": "3.0.16",
+        "public-encrypt": "4.0.2",
+        "randombytes": "2.0.6",
+        "randomfill": "1.0.4"
       }
     },
     "csp-parse": {
-      "version": "github:macropodhq/csp-parse#db7d5f954b420b527d7fb452a93bb6e2fa302c5a",
-      "from": "github:macropodhq/csp-parse"
+      "version": "github:macropodhq/csp-parse#db7d5f954b420b527d7fb452a93bb6e2fa302c5a"
     },
     "css-color-names": {
       "version": "0.0.4",
@@ -2602,20 +2843,20 @@
       "integrity": "sha1-w/mGSnAL4nEbtaJGKyOJsaOS2rc=",
       "dev": true,
       "requires": {
-        "babel-code-frame": "^6.26.0",
-        "css-selector-tokenizer": "^0.7.0",
-        "cssnano": "^3.10.0",
-        "icss-utils": "^2.1.0",
-        "loader-utils": "^1.0.2",
-        "lodash.camelcase": "^4.3.0",
-        "object-assign": "^4.1.1",
-        "postcss": "^5.0.6",
-        "postcss-modules-extract-imports": "^1.2.0",
-        "postcss-modules-local-by-default": "^1.2.0",
-        "postcss-modules-scope": "^1.1.0",
-        "postcss-modules-values": "^1.3.0",
-        "postcss-value-parser": "^3.3.0",
-        "source-list-map": "^2.0.0"
+        "babel-code-frame": "6.26.0",
+        "css-selector-tokenizer": "0.7.0",
+        "cssnano": "3.10.0",
+        "icss-utils": "2.1.0",
+        "loader-utils": "1.1.0",
+        "lodash.camelcase": "4.3.0",
+        "object-assign": "4.1.1",
+        "postcss": "5.2.18",
+        "postcss-modules-extract-imports": "1.2.0",
+        "postcss-modules-local-by-default": "1.2.0",
+        "postcss-modules-scope": "1.1.0",
+        "postcss-modules-values": "1.3.0",
+        "postcss-value-parser": "3.3.0",
+        "source-list-map": "2.0.0"
       }
     },
     "css-select": {
@@ -2624,10 +2865,10 @@
       "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
       "dev": true,
       "requires": {
-        "boolbase": "~1.0.0",
-        "css-what": "2.1",
+        "boolbase": "1.0.0",
+        "css-what": "2.1.0",
         "domutils": "1.5.1",
-        "nth-check": "~1.0.1"
+        "nth-check": "1.0.1"
       }
     },
     "css-selector-tokenizer": {
@@ -2636,9 +2877,9 @@
       "integrity": "sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=",
       "dev": true,
       "requires": {
-        "cssesc": "^0.1.0",
-        "fastparse": "^1.1.1",
-        "regexpu-core": "^1.0.0"
+        "cssesc": "0.1.0",
+        "fastparse": "1.1.1",
+        "regexpu-core": "1.0.0"
       },
       "dependencies": {
         "regexpu-core": {
@@ -2647,9 +2888,9 @@
           "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
           "dev": true,
           "requires": {
-            "regenerate": "^1.2.1",
-            "regjsgen": "^0.2.0",
-            "regjsparser": "^0.1.4"
+            "regenerate": "1.3.3",
+            "regjsgen": "0.2.0",
+            "regjsparser": "0.1.5"
           }
         }
       }
@@ -2672,38 +2913,38 @@
       "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=",
       "dev": true,
       "requires": {
-        "autoprefixer": "^6.3.1",
-        "decamelize": "^1.1.2",
-        "defined": "^1.0.0",
-        "has": "^1.0.1",
-        "object-assign": "^4.0.1",
-        "postcss": "^5.0.14",
-        "postcss-calc": "^5.2.0",
-        "postcss-colormin": "^2.1.8",
-        "postcss-convert-values": "^2.3.4",
-        "postcss-discard-comments": "^2.0.4",
-        "postcss-discard-duplicates": "^2.0.1",
-        "postcss-discard-empty": "^2.0.1",
-        "postcss-discard-overridden": "^0.1.1",
-        "postcss-discard-unused": "^2.2.1",
-        "postcss-filter-plugins": "^2.0.0",
-        "postcss-merge-idents": "^2.1.5",
-        "postcss-merge-longhand": "^2.0.1",
-        "postcss-merge-rules": "^2.0.3",
-        "postcss-minify-font-values": "^1.0.2",
-        "postcss-minify-gradients": "^1.0.1",
-        "postcss-minify-params": "^1.0.4",
-        "postcss-minify-selectors": "^2.0.4",
-        "postcss-normalize-charset": "^1.1.0",
-        "postcss-normalize-url": "^3.0.7",
-        "postcss-ordered-values": "^2.1.0",
-        "postcss-reduce-idents": "^2.2.2",
-        "postcss-reduce-initial": "^1.0.0",
-        "postcss-reduce-transforms": "^1.0.3",
-        "postcss-svgo": "^2.1.1",
-        "postcss-unique-selectors": "^2.0.2",
-        "postcss-value-parser": "^3.2.3",
-        "postcss-zindex": "^2.0.1"
+        "autoprefixer": "6.7.7",
+        "decamelize": "1.2.0",
+        "defined": "1.0.0",
+        "has": "1.0.3",
+        "object-assign": "4.1.1",
+        "postcss": "5.2.18",
+        "postcss-calc": "5.3.1",
+        "postcss-colormin": "2.2.2",
+        "postcss-convert-values": "2.6.1",
+        "postcss-discard-comments": "2.0.4",
+        "postcss-discard-duplicates": "2.1.0",
+        "postcss-discard-empty": "2.1.0",
+        "postcss-discard-overridden": "0.1.1",
+        "postcss-discard-unused": "2.2.3",
+        "postcss-filter-plugins": "2.0.3",
+        "postcss-merge-idents": "2.1.7",
+        "postcss-merge-longhand": "2.0.2",
+        "postcss-merge-rules": "2.1.2",
+        "postcss-minify-font-values": "1.0.5",
+        "postcss-minify-gradients": "1.0.5",
+        "postcss-minify-params": "1.2.2",
+        "postcss-minify-selectors": "2.1.1",
+        "postcss-normalize-charset": "1.1.1",
+        "postcss-normalize-url": "3.0.8",
+        "postcss-ordered-values": "2.2.3",
+        "postcss-reduce-idents": "2.4.0",
+        "postcss-reduce-initial": "1.0.1",
+        "postcss-reduce-transforms": "1.0.4",
+        "postcss-svgo": "2.1.6",
+        "postcss-unique-selectors": "2.0.2",
+        "postcss-value-parser": "3.3.0",
+        "postcss-zindex": "2.2.0"
       }
     },
     "csso": {
@@ -2712,8 +2953,8 @@
       "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=",
       "dev": true,
       "requires": {
-        "clap": "^1.0.9",
-        "source-map": "^0.5.3"
+        "clap": "1.2.3",
+        "source-map": "0.5.7"
       }
     },
     "cuint": {
@@ -2726,7 +2967,7 @@
       "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
       "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
       "requires": {
-        "array-find-index": "^1.0.1"
+        "array-find-index": "1.0.2"
       }
     },
     "cyclist": {
@@ -2741,7 +2982,7 @@
       "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
       "dev": true,
       "requires": {
-        "es5-ext": "^0.10.9"
+        "es5-ext": "0.10.38"
       }
     },
     "dashdash": {
@@ -2749,7 +2990,7 @@
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
       "requires": {
-        "assert-plus": "^1.0.0"
+        "assert-plus": "1.0.0"
       }
     },
     "date-now": {
@@ -2801,7 +3042,7 @@
       "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
       "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
       "requires": {
-        "mimic-response": "^1.0.0"
+        "mimic-response": "1.0.1"
       }
     },
     "decompress-zip": {
@@ -2809,12 +3050,12 @@
       "resolved": "https://registry.npmjs.org/decompress-zip/-/decompress-zip-0.3.0.tgz",
       "integrity": "sha1-rjvLfjTGWHmt/nfhnDD4ZgK0vbA=",
       "requires": {
-        "binary": "^0.3.0",
-        "graceful-fs": "^4.1.3",
-        "mkpath": "^0.1.0",
-        "nopt": "^3.0.1",
-        "q": "^1.1.2",
-        "readable-stream": "^1.1.8",
+        "binary": "0.3.0",
+        "graceful-fs": "4.1.11",
+        "mkpath": "0.1.0",
+        "nopt": "3.0.6",
+        "q": "1.5.1",
+        "readable-stream": "1.1.14",
         "touch": "0.0.3"
       }
     },
@@ -2841,7 +3082,7 @@
       "integrity": "sha1-y2ETGESthNhHiPto/QFoHKd4Gi8=",
       "dev": true,
       "requires": {
-        "kind-of": "^5.0.2"
+        "kind-of": "5.1.0"
       },
       "dependencies": {
         "kind-of": {
@@ -2864,7 +3105,7 @@
       "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
       "dev": true,
       "requires": {
-        "clone": "^1.0.2"
+        "clone": "1.0.3"
       }
     },
     "define-properties": {
@@ -2873,8 +3114,8 @@
       "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
       "dev": true,
       "requires": {
-        "foreach": "^2.0.5",
-        "object-keys": "^1.0.8"
+        "foreach": "2.0.5",
+        "object-keys": "1.0.11"
       },
       "dependencies": {
         "object-keys": {
@@ -2891,7 +3132,7 @@
       "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
       "dev": true,
       "requires": {
-        "is-descriptor": "^1.0.0"
+        "is-descriptor": "1.0.2"
       }
     },
     "defined": {
@@ -2906,12 +3147,12 @@
       "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
       "dev": true,
       "requires": {
-        "globby": "^6.1.0",
-        "is-path-cwd": "^1.0.0",
-        "is-path-in-cwd": "^1.0.0",
-        "p-map": "^1.1.1",
-        "pify": "^3.0.0",
-        "rimraf": "^2.2.8"
+        "globby": "6.1.0",
+        "is-path-cwd": "1.0.0",
+        "is-path-in-cwd": "1.0.0",
+        "p-map": "1.2.0",
+        "pify": "3.0.0",
+        "rimraf": "2.6.2"
       }
     },
     "delayed-stream": {
@@ -2936,8 +3177,8 @@
       "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1"
       }
     },
     "detect-file": {
@@ -2952,7 +3193,7 @@
       "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
       "dev": true,
       "requires": {
-        "repeating": "^2.0.0"
+        "repeating": "2.0.1"
       }
     },
     "detect-libc": {
@@ -2972,9 +3213,9 @@
       "integrity": "sha1-QOjumPVaIUlgcUaSHGPhrl89KHU=",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
+        "bn.js": "4.11.8",
+        "miller-rabin": "4.0.1",
+        "randombytes": "2.0.6"
       }
     },
     "doctrine": {
@@ -2983,7 +3224,7 @@
       "integrity": "sha1-XNAfwQFiG0LEzX9dGmYkNxbT850=",
       "dev": true,
       "requires": {
-        "esutils": "^2.0.2"
+        "esutils": "2.0.2"
       }
     },
     "dom-converter": {
@@ -2992,7 +3233,7 @@
       "integrity": "sha1-pF71cnuJDJv/5tfIduexnLDhfzs=",
       "dev": true,
       "requires": {
-        "utila": "~0.3"
+        "utila": "0.3.3"
       },
       "dependencies": {
         "utila": {
@@ -3009,8 +3250,8 @@
       "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
       "dev": true,
       "requires": {
-        "domelementtype": "~1.1.1",
-        "entities": "~1.1.1"
+        "domelementtype": "1.1.3",
+        "entities": "1.1.1"
       },
       "dependencies": {
         "domelementtype": {
@@ -3039,7 +3280,7 @@
       "integrity": "sha1-0mRvXlf2w7qxHPbLBdPArPdBJZQ=",
       "dev": true,
       "requires": {
-        "domelementtype": "1"
+        "domelementtype": "1.3.0"
       }
     },
     "domutils": {
@@ -3048,8 +3289,8 @@
       "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
       "dev": true,
       "requires": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
+        "dom-serializer": "0.1.0",
+        "domelementtype": "1.3.0"
       }
     },
     "duplexer": {
@@ -3064,7 +3305,7 @@
       "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
       "dev": true,
       "requires": {
-        "readable-stream": "~1.1.9"
+        "readable-stream": "1.1.14"
       }
     },
     "duplexify": {
@@ -3073,10 +3314,10 @@
       "integrity": "sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA==",
       "dev": true,
       "requires": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
+        "end-of-stream": "1.4.1",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.5",
+        "stream-shift": "1.0.0"
       },
       "dependencies": {
         "end-of-stream": {
@@ -3085,7 +3326,7 @@
           "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
           "dev": true,
           "requires": {
-            "once": "^1.4.0"
+            "once": "1.4.0"
           }
         },
         "isarray": {
@@ -3106,13 +3347,13 @@
           "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.0.3",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.0.3",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -3121,7 +3362,7 @@
           "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         }
       }
@@ -3132,8 +3373,8 @@
       "integrity": "sha1-6kWkFNFt1c+kGbGoFyDVygaJIzM=",
       "dev": true,
       "requires": {
-        "is-plain-object": "^2.0.1",
-        "object.defaults": "^1.1.0"
+        "is-plain-object": "2.0.4",
+        "object.defaults": "1.1.0"
       }
     },
     "ecc-jsbn": {
@@ -3142,7 +3383,7 @@
       "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
       "optional": true,
       "requires": {
-        "jsbn": "~0.1.0"
+        "jsbn": "0.1.1"
       }
     },
     "editorconfig": {
@@ -3151,11 +3392,11 @@
       "integrity": "sha1-5SGeWHlR1glY/ZTqmpoAjN7/GzQ=",
       "dev": true,
       "requires": {
-        "bluebird": "^3.0.5",
-        "commander": "^2.9.0",
-        "lru-cache": "^3.2.0",
-        "semver": "^5.1.0",
-        "sigmund": "^1.0.1"
+        "bluebird": "3.5.1",
+        "commander": "2.16.0",
+        "lru-cache": "3.2.0",
+        "semver": "5.5.0",
+        "sigmund": "1.0.1"
       },
       "dependencies": {
         "lru-cache": {
@@ -3164,7 +3405,7 @@
           "integrity": "sha1-cXibO39Tmb7IVl3aOKow0qCX7+4=",
           "dev": true,
           "requires": {
-            "pseudomap": "^1.0.1"
+            "pseudomap": "1.0.2"
           }
         }
       }
@@ -3175,9 +3416,9 @@
       "integrity": "sha512-770Hzxq10nQrzq39uVmvHLNKpPY3TCNrk+IYGDQTNWqmkreXZX6+9iflMMo+xdg1ZHysrTj1QQZvsjjBY176pg==",
       "dev": true,
       "requires": {
-        "@types/node": "^8.0.24",
-        "electron-download": "^4.1.0",
-        "extract-zip": "^1.0.3"
+        "@types/node": "8.10.38",
+        "electron-download": "4.1.1",
+        "extract-zip": "1.6.7"
       }
     },
     "electron-download": {
@@ -3186,15 +3427,15 @@
       "integrity": "sha512-FjEWG9Jb/ppK/2zToP+U5dds114fM1ZOJqMAR4aXXL5CvyPE9fiqBK/9YcwC9poIFQTEJk/EM/zyRwziziRZrg==",
       "dev": true,
       "requires": {
-        "debug": "^3.0.0",
-        "env-paths": "^1.0.0",
-        "fs-extra": "^4.0.1",
-        "minimist": "^1.2.0",
-        "nugget": "^2.0.1",
-        "path-exists": "^3.0.0",
-        "rc": "^1.2.1",
-        "semver": "^5.4.1",
-        "sumchecker": "^2.0.2"
+        "debug": "3.2.6",
+        "env-paths": "1.0.0",
+        "fs-extra": "4.0.3",
+        "minimist": "1.2.0",
+        "nugget": "2.0.1",
+        "path-exists": "3.0.0",
+        "rc": "1.2.8",
+        "semver": "5.5.0",
+        "sumchecker": "2.0.2"
       },
       "dependencies": {
         "debug": {
@@ -3203,7 +3444,7 @@
           "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.1"
           }
         },
         "fs-extra": {
@@ -3212,9 +3453,9 @@
           "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
+            "graceful-fs": "4.1.11",
+            "jsonfile": "4.0.0",
+            "universalify": "0.1.2"
           }
         },
         "minimist": {
@@ -3237,16 +3478,16 @@
       "integrity": "sha1-v/+6ZNp44bQDy3nVFQz6MzZkUUA=",
       "dev": true,
       "requires": {
-        "colors": "^1.2.0",
-        "debug": "^2.6.3",
-        "detect-libc": "^1.0.3",
-        "fs-extra": "^3.0.1",
-        "node-abi": "^2.0.0",
-        "node-gyp": "^3.6.0",
-        "ora": "^1.2.0",
-        "rimraf": "^2.6.1",
-        "spawn-rx": "^2.0.10",
-        "yargs": "^7.0.2"
+        "colors": "1.3.1",
+        "debug": "2.6.9",
+        "detect-libc": "1.0.3",
+        "fs-extra": "3.0.1",
+        "node-abi": "2.4.3",
+        "node-gyp": "3.7.0",
+        "ora": "1.4.0",
+        "rimraf": "2.6.2",
+        "spawn-rx": "2.0.12",
+        "yargs": "7.1.0"
       },
       "dependencies": {
         "colors": {
@@ -3261,9 +3502,9 @@
           "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^3.0.0",
-            "universalify": "^0.1.0"
+            "graceful-fs": "4.1.11",
+            "jsonfile": "3.0.1",
+            "universalify": "0.1.2"
           }
         },
         "jsonfile": {
@@ -3272,7 +3513,7 @@
           "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.6"
+            "graceful-fs": "4.1.11"
           }
         }
       }
@@ -3289,13 +3530,13 @@
       "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=",
       "dev": true,
       "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
+        "bn.js": "4.11.8",
+        "brorand": "1.1.0",
+        "hash.js": "1.1.4",
+        "hmac-drbg": "1.0.1",
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1",
+        "minimalistic-crypto-utils": "1.0.1"
       }
     },
     "emojis-list": {
@@ -3309,7 +3550,7 @@
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
       "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
       "requires": {
-        "once": "^1.4.0"
+        "once": "1.4.0"
       }
     },
     "enhanced-resolve": {
@@ -3318,10 +3559,10 @@
       "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.4.0",
-        "object-assign": "^4.0.1",
-        "tapable": "^0.2.7"
+        "graceful-fs": "4.1.11",
+        "memory-fs": "0.4.1",
+        "object-assign": "4.1.1",
+        "tapable": "0.2.8"
       },
       "dependencies": {
         "tapable": {
@@ -3350,7 +3591,7 @@
       "integrity": "sha1-RoTXF3mtOa8Xfj8AeZb3xnyFJhg=",
       "dev": true,
       "requires": {
-        "prr": "~1.0.1"
+        "prr": "1.0.1"
       }
     },
     "error-ex": {
@@ -3358,7 +3599,7 @@
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
       "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
       "requires": {
-        "is-arrayish": "^0.2.1"
+        "is-arrayish": "0.2.1"
       }
     },
     "es-abstract": {
@@ -3367,11 +3608,11 @@
       "integrity": "sha1-nbvdJ8aFbwABQhyhh4LXhr+KYWU=",
       "dev": true,
       "requires": {
-        "es-to-primitive": "^1.1.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.1",
-        "is-callable": "^1.1.3",
-        "is-regex": "^1.0.4"
+        "es-to-primitive": "1.1.1",
+        "function-bind": "1.1.1",
+        "has": "1.0.3",
+        "is-callable": "1.1.4",
+        "is-regex": "1.0.4"
       }
     },
     "es-to-primitive": {
@@ -3380,9 +3621,9 @@
       "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
       "dev": true,
       "requires": {
-        "is-callable": "^1.1.1",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.1"
+        "is-callable": "1.1.4",
+        "is-date-object": "1.0.1",
+        "is-symbol": "1.0.1"
       }
     },
     "es5-ext": {
@@ -3391,8 +3632,8 @@
       "integrity": "sha1-+n1A1lu8m7imfh0/nMZWoAUw7tM=",
       "dev": true,
       "requires": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.1"
+        "es6-iterator": "2.0.3",
+        "es6-symbol": "3.1.1"
       }
     },
     "es6-iterator": {
@@ -3401,9 +3642,9 @@
       "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
+        "d": "1.0.0",
+        "es5-ext": "0.10.38",
+        "es6-symbol": "3.1.1"
       }
     },
     "es6-map": {
@@ -3412,12 +3653,12 @@
       "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14",
-        "es6-iterator": "~2.0.1",
-        "es6-set": "~0.1.5",
-        "es6-symbol": "~3.1.1",
-        "event-emitter": "~0.3.5"
+        "d": "1.0.0",
+        "es5-ext": "0.10.38",
+        "es6-iterator": "2.0.3",
+        "es6-set": "0.1.5",
+        "es6-symbol": "3.1.1",
+        "event-emitter": "0.3.5"
       }
     },
     "es6-set": {
@@ -3426,11 +3667,11 @@
       "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14",
-        "es6-iterator": "~2.0.1",
+        "d": "1.0.0",
+        "es5-ext": "0.10.38",
+        "es6-iterator": "2.0.3",
         "es6-symbol": "3.1.1",
-        "event-emitter": "~0.3.5"
+        "event-emitter": "0.3.5"
       }
     },
     "es6-symbol": {
@@ -3439,8 +3680,8 @@
       "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
+        "d": "1.0.0",
+        "es5-ext": "0.10.38"
       }
     },
     "es6-weak-map": {
@@ -3449,10 +3690,10 @@
       "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.14",
-        "es6-iterator": "^2.0.1",
-        "es6-symbol": "^3.1.1"
+        "d": "1.0.0",
+        "es5-ext": "0.10.38",
+        "es6-iterator": "2.0.3",
+        "es6-symbol": "3.1.1"
       }
     },
     "escape-string-regexp": {
@@ -3466,10 +3707,10 @@
       "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
       "dev": true,
       "requires": {
-        "es6-map": "^0.1.3",
-        "es6-weak-map": "^2.0.1",
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
+        "es6-map": "0.1.5",
+        "es6-weak-map": "2.0.2",
+        "esrecurse": "4.2.1",
+        "estraverse": "4.2.0"
       }
     },
     "eslint": {
@@ -3478,44 +3719,44 @@
       "integrity": "sha1-MtHWU+HZBAiFS/spbwdux+GGowA=",
       "dev": true,
       "requires": {
-        "ajv": "^5.3.0",
-        "babel-code-frame": "^6.22.0",
-        "chalk": "^2.1.0",
-        "concat-stream": "^1.6.0",
-        "cross-spawn": "^5.1.0",
-        "debug": "^3.1.0",
-        "doctrine": "^2.1.0",
-        "eslint-scope": "^3.7.1",
-        "eslint-visitor-keys": "^1.0.0",
-        "espree": "^3.5.4",
-        "esquery": "^1.0.0",
-        "esutils": "^2.0.2",
-        "file-entry-cache": "^2.0.0",
-        "functional-red-black-tree": "^1.0.1",
-        "glob": "^7.1.2",
-        "globals": "^11.0.1",
-        "ignore": "^3.3.3",
-        "imurmurhash": "^0.1.4",
-        "inquirer": "^3.0.6",
-        "is-resolvable": "^1.0.0",
-        "js-yaml": "^3.9.1",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.3.0",
-        "lodash": "^4.17.4",
-        "minimatch": "^3.0.2",
-        "mkdirp": "^0.5.1",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.8.2",
-        "path-is-inside": "^1.0.2",
-        "pluralize": "^7.0.0",
-        "progress": "^2.0.0",
-        "regexpp": "^1.0.1",
-        "require-uncached": "^1.0.3",
-        "semver": "^5.3.0",
-        "strip-ansi": "^4.0.0",
-        "strip-json-comments": "~2.0.1",
+        "ajv": "5.5.2",
+        "babel-code-frame": "6.26.0",
+        "chalk": "2.4.1",
+        "concat-stream": "1.6.0",
+        "cross-spawn": "5.1.0",
+        "debug": "3.1.0",
+        "doctrine": "2.1.0",
+        "eslint-scope": "3.7.1",
+        "eslint-visitor-keys": "1.0.0",
+        "espree": "3.5.4",
+        "esquery": "1.0.1",
+        "esutils": "2.0.2",
+        "file-entry-cache": "2.0.0",
+        "functional-red-black-tree": "1.0.1",
+        "glob": "7.1.2",
+        "globals": "11.7.0",
+        "ignore": "3.3.10",
+        "imurmurhash": "0.1.4",
+        "inquirer": "3.3.0",
+        "is-resolvable": "1.1.0",
+        "js-yaml": "3.12.0",
+        "json-stable-stringify-without-jsonify": "1.0.1",
+        "levn": "0.3.0",
+        "lodash": "4.17.11",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "natural-compare": "1.4.0",
+        "optionator": "0.8.2",
+        "path-is-inside": "1.0.2",
+        "pluralize": "7.0.0",
+        "progress": "2.0.0",
+        "regexpp": "1.1.0",
+        "require-uncached": "1.0.3",
+        "semver": "5.5.0",
+        "strip-ansi": "4.0.0",
+        "strip-json-comments": "2.0.1",
         "table": "4.0.2",
-        "text-table": "~0.2.0"
+        "text-table": "0.2.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -3530,7 +3771,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "^1.9.0"
+            "color-convert": "1.9.2"
           }
         },
         "chalk": {
@@ -3539,9 +3780,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
           }
         },
         "debug": {
@@ -3577,8 +3818,8 @@
           "integrity": "sha1-6u1lbsg0TxD1J8a/obbiJE3hZ9E=",
           "dev": true,
           "requires": {
-            "argparse": "^1.0.7",
-            "esprima": "^4.0.0"
+            "argparse": "1.0.10",
+            "esprima": "4.0.0"
           }
         },
         "strip-ansi": {
@@ -3587,7 +3828,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "3.0.0"
           }
         },
         "supports-color": {
@@ -3596,7 +3837,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -3607,7 +3848,7 @@
       "integrity": "sha1-yCm5/GJYLBiXtaC5Sv1E7MpRHmM=",
       "dev": true,
       "requires": {
-        "vue-eslint-parser": "^2.0.3"
+        "vue-eslint-parser": "2.0.3"
       }
     },
     "eslint-scope": {
@@ -3616,8 +3857,8 @@
       "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
       "dev": true,
       "requires": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
+        "esrecurse": "4.2.1",
+        "estraverse": "4.2.0"
       }
     },
     "eslint-visitor-keys": {
@@ -3632,8 +3873,8 @@
       "integrity": "sha1-sPRHGHyKi+2US4FaZgvd9d610ac=",
       "dev": true,
       "requires": {
-        "acorn": "^5.5.0",
-        "acorn-jsx": "^3.0.0"
+        "acorn": "5.7.1",
+        "acorn-jsx": "3.0.1"
       }
     },
     "esprima": {
@@ -3648,7 +3889,7 @@
       "integrity": "sha1-QGxRZYsfWZGl+bYrHcJbAOPlxwg=",
       "dev": true,
       "requires": {
-        "estraverse": "^4.0.0"
+        "estraverse": "4.2.0"
       }
     },
     "esrecurse": {
@@ -3657,7 +3898,7 @@
       "integrity": "sha1-AHo7n9vCs7uH5IeeoZyS/b05Qs8=",
       "dev": true,
       "requires": {
-        "estraverse": "^4.1.0"
+        "estraverse": "4.2.0"
       }
     },
     "estraverse": {
@@ -3678,8 +3919,8 @@
       "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
+        "d": "1.0.0",
+        "es5-ext": "0.10.38"
       }
     },
     "event-stream": {
@@ -3688,13 +3929,13 @@
       "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
       "dev": true,
       "requires": {
-        "duplexer": "~0.1.1",
-        "from": "~0",
-        "map-stream": "~0.1.0",
+        "duplexer": "0.1.1",
+        "from": "0.1.7",
+        "map-stream": "0.1.0",
         "pause-stream": "0.0.11",
-        "split": "0.3",
-        "stream-combiner": "~0.0.4",
-        "through": "~2.3.1"
+        "split": "0.3.3",
+        "stream-combiner": "0.0.4",
+        "through": "2.3.8"
       }
     },
     "events": {
@@ -3709,8 +3950,8 @@
       "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=",
       "dev": true,
       "requires": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
+        "md5.js": "1.3.4",
+        "safe-buffer": "5.1.1"
       }
     },
     "execa": {
@@ -3719,13 +3960,13 @@
       "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
       "dev": true,
       "requires": {
-        "cross-spawn": "^5.0.1",
-        "get-stream": "^3.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
+        "cross-spawn": "5.1.0",
+        "get-stream": "3.0.0",
+        "is-stream": "1.1.0",
+        "npm-run-path": "2.0.2",
+        "p-finally": "1.0.0",
+        "signal-exit": "3.0.2",
+        "strip-eof": "1.0.0"
       }
     },
     "exit-hook": {
@@ -3740,13 +3981,13 @@
       "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
       "dev": true,
       "requires": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "debug": "2.6.9",
+        "define-property": "0.2.5",
+        "extend-shallow": "2.0.1",
+        "posix-character-classes": "0.1.1",
+        "regex-not": "1.0.0",
+        "snapdragon": "0.8.1",
+        "to-regex": "3.0.1"
       },
       "dependencies": {
         "define-property": {
@@ -3755,7 +3996,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         },
         "is-accessor-descriptor": {
@@ -3764,7 +4005,7 @@
           "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           },
           "dependencies": {
             "kind-of": {
@@ -3773,7 +4014,7 @@
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "is-buffer": "1.1.6"
               }
             }
           }
@@ -3784,7 +4025,7 @@
           "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           },
           "dependencies": {
             "kind-of": {
@@ -3793,7 +4034,7 @@
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "is-buffer": "1.1.6"
               }
             }
           }
@@ -3804,9 +4045,9 @@
           "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
+            "is-accessor-descriptor": "0.1.6",
+            "is-data-descriptor": "0.1.4",
+            "kind-of": "5.1.0"
           }
         },
         "kind-of": {
@@ -3823,7 +4064,7 @@
       "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
       "dev": true,
       "requires": {
-        "fill-range": "^2.1.0"
+        "fill-range": "2.2.4"
       },
       "dependencies": {
         "fill-range": {
@@ -3832,11 +4073,11 @@
           "integrity": "sha1-6x53OrsFbc2N8r/favWbizqTZWU=",
           "dev": true,
           "requires": {
-            "is-number": "^2.1.0",
-            "isobject": "^2.0.0",
-            "randomatic": "^3.0.0",
-            "repeat-element": "^1.1.2",
-            "repeat-string": "^1.5.2"
+            "is-number": "2.1.0",
+            "isobject": "2.1.0",
+            "randomatic": "3.0.0",
+            "repeat-element": "1.1.2",
+            "repeat-string": "1.6.1"
           }
         },
         "is-number": {
@@ -3845,7 +4086,7 @@
           "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           }
         },
         "isarray": {
@@ -3869,7 +4110,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -3885,7 +4126,7 @@
       "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
       "dev": true,
       "requires": {
-        "homedir-polyfill": "^1.0.1"
+        "homedir-polyfill": "1.0.1"
       }
     },
     "extend": {
@@ -3899,7 +4140,7 @@
       "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
       "dev": true,
       "requires": {
-        "is-extendable": "^0.1.0"
+        "is-extendable": "0.1.1"
       }
     },
     "external-editor": {
@@ -3908,9 +4149,9 @@
       "integrity": "sha1-BFURz9jRM/OEZnPRBHwVTiFK09U=",
       "dev": true,
       "requires": {
-        "chardet": "^0.4.0",
-        "iconv-lite": "^0.4.17",
-        "tmp": "^0.0.33"
+        "chardet": "0.4.2",
+        "iconv-lite": "0.4.23",
+        "tmp": "0.0.33"
       }
     },
     "extglob": {
@@ -3919,14 +4160,14 @@
       "integrity": "sha1-rQD+TcYSqSMuhxhxHcXLWrAoVUM=",
       "dev": true,
       "requires": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "array-unique": "0.3.2",
+        "define-property": "1.0.0",
+        "expand-brackets": "2.1.4",
+        "extend-shallow": "2.0.1",
+        "fragment-cache": "0.2.1",
+        "regex-not": "1.0.0",
+        "snapdragon": "0.8.1",
+        "to-regex": "3.0.1"
       }
     },
     "extract-zip": {
@@ -3947,10 +4188,10 @@
           "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
           "dev": true,
           "requires": {
-            "buffer-from": "^1.0.0",
-            "inherits": "^2.0.3",
-            "readable-stream": "^2.2.2",
-            "typedarray": "^0.0.6"
+            "buffer-from": "1.1.1",
+            "inherits": "2.0.3",
+            "readable-stream": "2.3.6",
+            "typedarray": "0.0.6"
           }
         },
         "isarray": {
@@ -3971,13 +4212,13 @@
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -3986,7 +4227,7 @@
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         }
       }
@@ -4002,9 +4243,9 @@
       "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=",
       "dev": true,
       "requires": {
-        "ansi-gray": "^0.1.1",
-        "color-support": "^1.1.3",
-        "time-stamp": "^1.0.0"
+        "ansi-gray": "0.1.1",
+        "color-support": "1.1.3",
+        "time-stamp": "1.1.0"
       }
     },
     "fast-deep-equal": {
@@ -4035,7 +4276,7 @@
       "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
       "dev": true,
       "requires": {
-        "pend": "~1.2.0"
+        "pend": "1.2.0"
       }
     },
     "figures": {
@@ -4044,7 +4285,7 @@
       "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
       "dev": true,
       "requires": {
-        "escape-string-regexp": "^1.0.5"
+        "escape-string-regexp": "1.0.5"
       }
     },
     "file-entry-cache": {
@@ -4053,8 +4294,8 @@
       "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
       "dev": true,
       "requires": {
-        "flat-cache": "^1.2.1",
-        "object-assign": "^4.0.1"
+        "flat-cache": "1.3.0",
+        "object-assign": "4.1.1"
       }
     },
     "file-type": {
@@ -4075,7 +4316,7 @@
       "integrity": "sha1-9KGVc1Xdr0Q8zXiolfPVXiPIoDQ=",
       "dev": true,
       "requires": {
-        "debounce": "^1.0.0"
+        "debounce": "1.1.0"
       }
     },
     "fill-range": {
@@ -4084,10 +4325,10 @@
       "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
       "dev": true,
       "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
+        "extend-shallow": "2.0.1",
+        "is-number": "3.0.0",
+        "repeat-string": "1.6.1",
+        "to-regex-range": "2.1.1"
       }
     },
     "find-cache-dir": {
@@ -4096,9 +4337,9 @@
       "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
       "dev": true,
       "requires": {
-        "commondir": "^1.0.1",
-        "make-dir": "^1.0.0",
-        "pkg-dir": "^2.0.0"
+        "commondir": "1.0.1",
+        "make-dir": "1.3.0",
+        "pkg-dir": "2.0.0"
       }
     },
     "find-index": {
@@ -4113,7 +4354,7 @@
       "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
       "dev": true,
       "requires": {
-        "locate-path": "^2.0.0"
+        "locate-path": "2.0.0"
       }
     },
     "findup-sync": {
@@ -4122,10 +4363,10 @@
       "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
       "dev": true,
       "requires": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^3.1.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
+        "detect-file": "1.0.0",
+        "is-glob": "3.1.0",
+        "micromatch": "3.1.5",
+        "resolve-dir": "1.0.1"
       }
     },
     "fined": {
@@ -4134,11 +4375,11 @@
       "integrity": "sha1-s33IRLdqL15wgeiE98CuNE8VNHY=",
       "dev": true,
       "requires": {
-        "expand-tilde": "^2.0.2",
-        "is-plain-object": "^2.0.3",
-        "object.defaults": "^1.1.0",
-        "object.pick": "^1.2.0",
-        "parse-filepath": "^1.0.1"
+        "expand-tilde": "2.0.2",
+        "is-plain-object": "2.0.4",
+        "object.defaults": "1.1.0",
+        "object.pick": "1.3.0",
+        "parse-filepath": "1.0.2"
       }
     },
     "first-chunk-stream": {
@@ -4159,10 +4400,10 @@
       "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
       "dev": true,
       "requires": {
-        "circular-json": "^0.3.1",
-        "del": "^2.0.2",
-        "graceful-fs": "^4.1.2",
-        "write": "^0.2.1"
+        "circular-json": "0.3.3",
+        "del": "2.2.2",
+        "graceful-fs": "4.1.11",
+        "write": "0.2.1"
       },
       "dependencies": {
         "del": {
@@ -4171,13 +4412,13 @@
           "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
           "dev": true,
           "requires": {
-            "globby": "^5.0.0",
-            "is-path-cwd": "^1.0.0",
-            "is-path-in-cwd": "^1.0.0",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0",
-            "rimraf": "^2.2.8"
+            "globby": "5.0.0",
+            "is-path-cwd": "1.0.0",
+            "is-path-in-cwd": "1.0.0",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1",
+            "rimraf": "2.6.2"
           }
         },
         "globby": {
@@ -4186,12 +4427,12 @@
           "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
           "dev": true,
           "requires": {
-            "array-union": "^1.0.1",
-            "arrify": "^1.0.0",
-            "glob": "^7.0.3",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "array-union": "1.0.2",
+            "arrify": "1.0.1",
+            "glob": "7.1.2",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
           }
         },
         "pify": {
@@ -4214,8 +4455,8 @@
       "integrity": "sha1-xdWG7zivYJdlC0m8QbVfq7GfNb0=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.4"
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.5"
       },
       "dependencies": {
         "isarray": {
@@ -4236,13 +4477,13 @@
           "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.0.3",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.0.3",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -4251,7 +4492,7 @@
           "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         }
       }
@@ -4268,7 +4509,7 @@
       "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
       "dev": true,
       "requires": {
-        "for-in": "^1.0.1"
+        "for-in": "1.0.2"
       }
     },
     "foreach": {
@@ -4287,9 +4528,9 @@
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
       "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
       "requires": {
-        "asynckit": "^0.4.0",
+        "asynckit": "0.4.0",
         "combined-stream": "1.0.6",
-        "mime-types": "^2.1.12"
+        "mime-types": "2.1.17"
       }
     },
     "fragment-cache": {
@@ -4298,7 +4539,7 @@
       "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
       "dev": true,
       "requires": {
-        "map-cache": "^0.2.2"
+        "map-cache": "0.2.2"
       }
     },
     "from": {
@@ -4313,8 +4554,8 @@
       "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6"
       },
       "dependencies": {
         "isarray": {
@@ -4335,13 +4576,13 @@
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -4350,7 +4591,7 @@
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         }
       }
@@ -4361,7 +4602,7 @@
       "integrity": "sha1-91mDufL0E75ljJPf172M5AePXNs=",
       "dev": true,
       "requires": {
-        "js-yaml": "^3.4.6"
+        "js-yaml": "3.7.0"
       }
     },
     "fs-extra": {
@@ -4369,9 +4610,9 @@
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.0.tgz",
       "integrity": "sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==",
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
+        "graceful-fs": "4.1.11",
+        "jsonfile": "4.0.0",
+        "universalify": "0.1.2"
       }
     },
     "fs-mkdirp-stream": {
@@ -4380,8 +4621,8 @@
       "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.11",
-        "through2": "^2.0.3"
+        "graceful-fs": "4.1.11",
+        "through2": "2.0.3"
       },
       "dependencies": {
         "isarray": {
@@ -4402,13 +4643,13 @@
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -4417,7 +4658,7 @@
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         },
         "through2": {
@@ -4426,8 +4667,8 @@
           "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
           "dev": true,
           "requires": {
-            "readable-stream": "^2.1.5",
-            "xtend": "~4.0.1"
+            "readable-stream": "2.3.6",
+            "xtend": "4.0.1"
           }
         },
         "xtend": {
@@ -4444,10 +4685,10 @@
       "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "iferr": "^0.1.5",
-        "imurmurhash": "^0.1.4",
-        "readable-stream": "1 || 2"
+        "graceful-fs": "4.1.11",
+        "iferr": "0.1.5",
+        "imurmurhash": "0.1.4",
+        "readable-stream": "1.1.14"
       }
     },
     "fs.realpath": {
@@ -4462,8 +4703,8 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "nan": "^2.3.0",
-        "node-pre-gyp": "^0.6.39"
+        "nan": "2.8.0",
+        "node-pre-gyp": "0.6.39"
       },
       "dependencies": {
         "abbrev": {
@@ -4480,8 +4721,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "co": "^4.6.0",
-            "json-stable-stringify": "^1.0.1"
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
           }
         },
         "ansi-regex": {
@@ -4504,8 +4745,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "delegates": "^1.0.0",
-            "readable-stream": "^2.0.6"
+            "delegates": "1.0.0",
+            "readable-stream": "2.2.9"
           }
         },
         "asn1": {
@@ -4556,7 +4797,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "tweetnacl": "^0.14.3"
+            "tweetnacl": "0.14.5"
           }
         },
         "block-stream": {
@@ -4565,7 +4806,7 @@
           "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
           "dev": true,
           "requires": {
-            "inherits": "~2.0.0"
+            "inherits": "2.0.3"
           }
         },
         "boom": {
@@ -4574,7 +4815,7 @@
           "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
           "dev": true,
           "requires": {
-            "hoek": "2.x.x"
+            "hoek": "2.16.3"
           }
         },
         "brace-expansion": {
@@ -4583,7 +4824,7 @@
           "integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=",
           "dev": true,
           "requires": {
-            "balanced-match": "^0.4.1",
+            "balanced-match": "0.4.2",
             "concat-map": "0.0.1"
           }
         },
@@ -4619,7 +4860,7 @@
           "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
           "dev": true,
           "requires": {
-            "delayed-stream": "~1.0.0"
+            "delayed-stream": "1.0.0"
           }
         },
         "concat-map": {
@@ -4646,7 +4887,7 @@
           "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
           "dev": true,
           "requires": {
-            "boom": "2.x.x"
+            "boom": "2.10.1"
           }
         },
         "dashdash": {
@@ -4656,7 +4897,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "assert-plus": "^1.0.0"
+            "assert-plus": "1.0.0"
           },
           "dependencies": {
             "assert-plus": {
@@ -4712,7 +4953,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "jsbn": "~0.1.0"
+            "jsbn": "0.1.1"
           }
         },
         "extend": {
@@ -4759,10 +5000,10 @@
           "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "inherits": "~2.0.0",
-            "mkdirp": ">=0.5 0",
-            "rimraf": "2"
+            "graceful-fs": "4.1.11",
+            "inherits": "2.0.3",
+            "mkdirp": "0.5.1",
+            "rimraf": "2.6.1"
           }
         },
         "fstream-ignore": {
@@ -4772,9 +5013,9 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "fstream": "^1.0.0",
-            "inherits": "2",
-            "minimatch": "^3.0.0"
+            "fstream": "1.0.11",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4"
           }
         },
         "gauge": {
@@ -4784,14 +5025,14 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "aproba": "^1.0.3",
-            "console-control-strings": "^1.0.0",
-            "has-unicode": "^2.0.0",
-            "object-assign": "^4.1.0",
-            "signal-exit": "^3.0.0",
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wide-align": "^1.1.0"
+            "aproba": "1.1.1",
+            "console-control-strings": "1.1.0",
+            "has-unicode": "2.0.1",
+            "object-assign": "4.1.1",
+            "signal-exit": "3.0.2",
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wide-align": "1.1.2"
           }
         },
         "getpass": {
@@ -4801,7 +5042,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "assert-plus": "^1.0.0"
+            "assert-plus": "1.0.0"
           },
           "dependencies": {
             "assert-plus": {
@@ -4819,12 +5060,12 @@
           "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
           "dev": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
           }
         },
         "graceful-fs": {
@@ -4864,10 +5105,10 @@
           "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
           "dev": true,
           "requires": {
-            "boom": "2.x.x",
-            "cryptiles": "2.x.x",
-            "hoek": "2.x.x",
-            "sntp": "1.x.x"
+            "boom": "2.10.1",
+            "cryptiles": "2.0.5",
+            "hoek": "2.16.3",
+            "sntp": "1.0.9"
           }
         },
         "hoek": {
@@ -4883,9 +5124,9 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "assert-plus": "^0.2.0",
-            "jsprim": "^1.2.2",
-            "sshpk": "^1.7.0"
+            "assert-plus": "0.2.0",
+            "jsprim": "1.4.0",
+            "sshpk": "1.13.0"
           }
         },
         "inflight": {
@@ -4894,8 +5135,8 @@
           "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
           "dev": true,
           "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
           }
         },
         "inherits": {
@@ -4947,7 +5188,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "jsbn": "~0.1.0"
+            "jsbn": "0.1.1"
           }
         },
         "jsbn": {
@@ -4971,7 +5212,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "jsonify": "~0.0.0"
+            "jsonify": "0.0.0"
           }
         },
         "json-stringify-safe": {
@@ -5063,17 +5304,17 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "detect-libc": "^1.0.2",
+            "detect-libc": "1.0.2",
             "hawk": "3.1.3",
-            "mkdirp": "^0.5.1",
-            "nopt": "^4.0.1",
-            "npmlog": "^4.0.2",
-            "rc": "^1.1.7",
+            "mkdirp": "0.5.1",
+            "nopt": "4.0.1",
+            "npmlog": "4.1.0",
+            "rc": "1.2.1",
             "request": "2.81.0",
-            "rimraf": "^2.6.1",
-            "semver": "^5.3.0",
-            "tar": "^2.2.1",
-            "tar-pack": "^3.4.0"
+            "rimraf": "2.6.1",
+            "semver": "5.3.0",
+            "tar": "2.2.1",
+            "tar-pack": "3.4.0"
           }
         },
         "nopt": {
@@ -5094,10 +5335,10 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "are-we-there-yet": "~1.1.2",
-            "console-control-strings": "~1.1.0",
-            "gauge": "~2.7.3",
-            "set-blocking": "~2.0.0"
+            "are-we-there-yet": "1.1.4",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
           }
         },
         "number-is-nan": {
@@ -5126,7 +5367,7 @@
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
           "requires": {
-            "wrappy": "1"
+            "wrappy": "1.0.2"
           }
         },
         "os-homedir": {
@@ -5194,10 +5435,10 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "deep-extend": "~0.4.0",
-            "ini": "~1.3.0",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
+            "deep-extend": "0.4.2",
+            "ini": "1.3.4",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
           },
           "dependencies": {
             "minimist": {
@@ -5215,13 +5456,13 @@
           "integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=",
           "dev": true,
           "requires": {
-            "buffer-shims": "~1.0.0",
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~1.0.6",
-            "string_decoder": "~1.0.0",
-            "util-deprecate": "~1.0.1"
+            "buffer-shims": "1.0.0",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "1.0.1",
+            "util-deprecate": "1.0.2"
           }
         },
         "request": {
@@ -5231,28 +5472,28 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "aws-sign2": "~0.6.0",
-            "aws4": "^1.2.1",
-            "caseless": "~0.12.0",
-            "combined-stream": "~1.0.5",
-            "extend": "~3.0.0",
-            "forever-agent": "~0.6.1",
-            "form-data": "~2.1.1",
-            "har-validator": "~4.2.1",
-            "hawk": "~3.1.3",
-            "http-signature": "~1.1.0",
-            "is-typedarray": "~1.0.0",
-            "isstream": "~0.1.2",
-            "json-stringify-safe": "~5.0.1",
-            "mime-types": "~2.1.7",
-            "oauth-sign": "~0.8.1",
-            "performance-now": "^0.2.0",
-            "qs": "~6.4.0",
-            "safe-buffer": "^5.0.1",
-            "stringstream": "~0.0.4",
-            "tough-cookie": "~2.3.0",
-            "tunnel-agent": "^0.6.0",
-            "uuid": "^3.0.0"
+            "aws-sign2": "0.6.0",
+            "aws4": "1.6.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.5",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.1.4",
+            "har-validator": "4.2.1",
+            "hawk": "3.1.3",
+            "http-signature": "1.1.1",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.15",
+            "oauth-sign": "0.8.2",
+            "performance-now": "0.2.0",
+            "qs": "6.4.0",
+            "safe-buffer": "5.0.1",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.2",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.0.1"
           }
         },
         "rimraf": {
@@ -5261,7 +5502,7 @@
           "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
           "dev": true,
           "requires": {
-            "glob": "^7.0.5"
+            "glob": "7.1.2"
           }
         },
         "safe-buffer": {
@@ -5297,7 +5538,7 @@
           "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
           "dev": true,
           "requires": {
-            "hoek": "2.x.x"
+            "hoek": "2.16.3"
           }
         },
         "sshpk": {
@@ -5307,15 +5548,15 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "asn1": "~0.2.3",
-            "assert-plus": "^1.0.0",
-            "bcrypt-pbkdf": "^1.0.0",
-            "dashdash": "^1.12.0",
-            "ecc-jsbn": "~0.1.1",
-            "getpass": "^0.1.1",
-            "jodid25519": "^1.0.0",
-            "jsbn": "~0.1.0",
-            "tweetnacl": "~0.14.0"
+            "asn1": "0.2.3",
+            "assert-plus": "1.0.0",
+            "bcrypt-pbkdf": "1.0.1",
+            "dashdash": "1.14.1",
+            "ecc-jsbn": "0.1.1",
+            "getpass": "0.1.7",
+            "jodid25519": "1.0.2",
+            "jsbn": "0.1.1",
+            "tweetnacl": "0.14.5"
           },
           "dependencies": {
             "assert-plus": {
@@ -5333,9 +5574,9 @@
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
           }
         },
         "string_decoder": {
@@ -5344,7 +5585,7 @@
           "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
           "dev": true,
           "requires": {
-            "safe-buffer": "^5.0.1"
+            "safe-buffer": "5.0.1"
           }
         },
         "stringstream": {
@@ -5360,7 +5601,7 @@
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "2.1.1"
           }
         },
         "strip-json-comments": {
@@ -5376,9 +5617,9 @@
           "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
           "dev": true,
           "requires": {
-            "block-stream": "*",
-            "fstream": "^1.0.2",
-            "inherits": "2"
+            "block-stream": "0.0.9",
+            "fstream": "1.0.11",
+            "inherits": "2.0.3"
           }
         },
         "tar-pack": {
@@ -5388,14 +5629,14 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "debug": "^2.2.0",
-            "fstream": "^1.0.10",
-            "fstream-ignore": "^1.0.5",
-            "once": "^1.3.3",
-            "readable-stream": "^2.1.4",
-            "rimraf": "^2.5.1",
-            "tar": "^2.2.1",
-            "uid-number": "^0.0.6"
+            "debug": "2.6.8",
+            "fstream": "1.0.11",
+            "fstream-ignore": "1.0.5",
+            "once": "1.4.0",
+            "readable-stream": "2.2.9",
+            "rimraf": "2.6.1",
+            "tar": "2.2.1",
+            "uid-number": "0.0.6"
           }
         },
         "tough-cookie": {
@@ -5405,7 +5646,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "punycode": "^1.4.1"
+            "punycode": "1.4.1"
           }
         },
         "tunnel-agent": {
@@ -5415,7 +5656,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "safe-buffer": "^5.0.1"
+            "safe-buffer": "5.0.1"
           }
         },
         "tweetnacl": {
@@ -5462,7 +5703,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "string-width": "^1.0.2"
+            "string-width": "1.0.2"
           }
         },
         "wrappy": {
@@ -5478,10 +5719,10 @@
       "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
       "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "inherits": "~2.0.0",
-        "mkdirp": ">=0.5 0",
-        "rimraf": "2"
+        "graceful-fs": "4.1.11",
+        "inherits": "2.0.3",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2"
       }
     },
     "function-bind": {
@@ -5501,14 +5742,14 @@
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "requires": {
-        "aproba": "^1.0.3",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.0",
-        "object-assign": "^4.1.0",
-        "signal-exit": "^3.0.0",
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wide-align": "^1.1.0"
+        "aproba": "1.2.0",
+        "console-control-strings": "1.1.0",
+        "has-unicode": "2.0.1",
+        "object-assign": "4.1.1",
+        "signal-exit": "3.0.2",
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "wide-align": "1.1.3"
       }
     },
     "gaze": {
@@ -5517,7 +5758,7 @@
       "integrity": "sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=",
       "dev": true,
       "requires": {
-        "globule": "~0.1.0"
+        "globule": "0.1.0"
       }
     },
     "generate-function": {
@@ -5532,7 +5773,7 @@
       "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
       "dev": true,
       "requires": {
-        "is-property": "^1.0.0"
+        "is-property": "1.0.2"
       }
     },
     "get-caller-file": {
@@ -5562,7 +5803,7 @@
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
       "requires": {
-        "assert-plus": "^1.0.0"
+        "assert-plus": "1.0.0"
       }
     },
     "github-from-package": {
@@ -5575,12 +5816,12 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
       "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
       "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "fs.realpath": "1.0.0",
+        "inflight": "1.0.6",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4",
+        "once": "1.4.0",
+        "path-is-absolute": "1.0.1"
       }
     },
     "glob-base": {
@@ -5589,8 +5830,8 @@
       "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
       "dev": true,
       "requires": {
-        "glob-parent": "^2.0.0",
-        "is-glob": "^2.0.0"
+        "glob-parent": "2.0.0",
+        "is-glob": "2.0.1"
       },
       "dependencies": {
         "glob-parent": {
@@ -5599,7 +5840,7 @@
           "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
           "dev": true,
           "requires": {
-            "is-glob": "^2.0.0"
+            "is-glob": "2.0.1"
           }
         },
         "is-extglob": {
@@ -5614,7 +5855,7 @@
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
           "requires": {
-            "is-extglob": "^1.0.0"
+            "is-extglob": "1.0.0"
           }
         }
       }
@@ -5625,8 +5866,8 @@
       "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
       "dev": true,
       "requires": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
+        "is-glob": "3.1.0",
+        "path-dirname": "1.0.2"
       }
     },
     "glob-stream": {
@@ -5635,16 +5876,16 @@
       "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
       "dev": true,
       "requires": {
-        "extend": "^3.0.0",
-        "glob": "^7.1.1",
-        "glob-parent": "^3.1.0",
-        "is-negated-glob": "^1.0.0",
-        "ordered-read-streams": "^1.0.0",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.1.5",
-        "remove-trailing-separator": "^1.0.1",
-        "to-absolute-glob": "^2.0.0",
-        "unique-stream": "^2.0.2"
+        "extend": "3.0.1",
+        "glob": "7.1.2",
+        "glob-parent": "3.1.0",
+        "is-negated-glob": "1.0.0",
+        "ordered-read-streams": "1.0.1",
+        "pumpify": "1.4.0",
+        "readable-stream": "2.3.6",
+        "remove-trailing-separator": "1.1.0",
+        "to-absolute-glob": "2.0.2",
+        "unique-stream": "2.2.1"
       },
       "dependencies": {
         "isarray": {
@@ -5665,13 +5906,13 @@
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -5680,7 +5921,7 @@
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         }
       }
@@ -5691,10 +5932,10 @@
       "integrity": "sha1-I5qqYhtr2EOyiP32sVX1CWPH1+o=",
       "dev": true,
       "requires": {
-        "async-done": "^1.2.0",
-        "chokidar": "^2.0.0",
-        "just-debounce": "^1.0.0",
-        "object.defaults": "^1.1.0"
+        "async-done": "1.3.1",
+        "chokidar": "2.0.2",
+        "just-debounce": "1.0.0",
+        "object.defaults": "1.1.0"
       }
     },
     "glob2base": {
@@ -5703,7 +5944,7 @@
       "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=",
       "dev": true,
       "requires": {
-        "find-index": "^0.1.1"
+        "find-index": "0.1.1"
       }
     },
     "global-modules": {
@@ -5712,9 +5953,9 @@
       "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=",
       "dev": true,
       "requires": {
-        "global-prefix": "^1.0.1",
-        "is-windows": "^1.0.1",
-        "resolve-dir": "^1.0.0"
+        "global-prefix": "1.0.2",
+        "is-windows": "1.0.2",
+        "resolve-dir": "1.0.1"
       }
     },
     "global-prefix": {
@@ -5723,11 +5964,11 @@
       "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
       "dev": true,
       "requires": {
-        "expand-tilde": "^2.0.2",
-        "homedir-polyfill": "^1.0.1",
-        "ini": "^1.3.4",
-        "is-windows": "^1.0.1",
-        "which": "^1.2.14"
+        "expand-tilde": "2.0.2",
+        "homedir-polyfill": "1.0.1",
+        "ini": "1.3.5",
+        "is-windows": "1.0.2",
+        "which": "1.3.0"
       }
     },
     "globals": {
@@ -5742,11 +5983,11 @@
       "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
       "dev": true,
       "requires": {
-        "array-union": "^1.0.1",
-        "glob": "^7.0.3",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
+        "array-union": "1.0.2",
+        "glob": "7.1.2",
+        "object-assign": "4.1.1",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1"
       },
       "dependencies": {
         "pify": {
@@ -5763,9 +6004,9 @@
       "integrity": "sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=",
       "dev": true,
       "requires": {
-        "glob": "~3.1.21",
-        "lodash": "~1.0.1",
-        "minimatch": "~0.2.11"
+        "glob": "3.1.21",
+        "lodash": "1.0.2",
+        "minimatch": "0.2.14"
       },
       "dependencies": {
         "glob": {
@@ -5774,9 +6015,9 @@
           "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=",
           "dev": true,
           "requires": {
-            "graceful-fs": "~1.2.0",
-            "inherits": "1",
-            "minimatch": "~0.2.11"
+            "graceful-fs": "1.2.3",
+            "inherits": "1.0.2",
+            "minimatch": "0.2.14"
           }
         },
         "graceful-fs": {
@@ -5803,8 +6044,8 @@
           "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=",
           "dev": true,
           "requires": {
-            "lru-cache": "2",
-            "sigmund": "~1.0.0"
+            "lru-cache": "2.7.3",
+            "sigmund": "1.0.1"
           }
         }
       }
@@ -5815,7 +6056,7 @@
       "integrity": "sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=",
       "dev": true,
       "requires": {
-        "sparkles": "^1.0.0"
+        "sparkles": "1.0.0"
       }
     },
     "gonzales-pe-sl": {
@@ -5824,7 +6065,7 @@
       "integrity": "sha1-aoaLw4BkXxQf7rBCxvl/zHG1n+Y=",
       "dev": true,
       "requires": {
-        "minimist": "1.1.x"
+        "minimist": "1.1.3"
       },
       "dependencies": {
         "minimist": {
@@ -5846,10 +6087,10 @@
       "integrity": "sha1-lXZsYB2t5Kd+0+eyttwDiBtZY2Y=",
       "dev": true,
       "requires": {
-        "glob-watcher": "^5.0.0",
-        "gulp-cli": "^2.0.0",
-        "undertaker": "^1.0.0",
-        "vinyl-fs": "^3.0.0"
+        "glob-watcher": "5.0.1",
+        "gulp-cli": "2.0.1",
+        "undertaker": "1.2.0",
+        "vinyl-fs": "3.0.3"
       },
       "dependencies": {
         "gulp-cli": {
@@ -5858,24 +6099,24 @@
           "integrity": "sha1-eEfiIMs2YvK+im1XK/FOF75amUs=",
           "dev": true,
           "requires": {
-            "ansi-colors": "^1.0.1",
-            "archy": "^1.0.0",
-            "array-sort": "^1.0.0",
-            "color-support": "^1.1.3",
-            "concat-stream": "^1.6.0",
-            "copy-props": "^2.0.1",
-            "fancy-log": "^1.3.2",
-            "gulplog": "^1.0.0",
-            "interpret": "^1.1.0",
-            "isobject": "^3.0.1",
-            "liftoff": "^2.5.0",
-            "matchdep": "^2.0.0",
-            "mute-stdout": "^1.0.0",
-            "pretty-hrtime": "^1.0.0",
-            "replace-homedir": "^1.0.0",
-            "semver-greatest-satisfied-range": "^1.1.0",
-            "v8flags": "^3.0.1",
-            "yargs": "^7.1.0"
+            "ansi-colors": "1.1.0",
+            "archy": "1.0.0",
+            "array-sort": "1.0.0",
+            "color-support": "1.1.3",
+            "concat-stream": "1.6.0",
+            "copy-props": "2.0.4",
+            "fancy-log": "1.3.2",
+            "gulplog": "1.0.0",
+            "interpret": "1.1.0",
+            "isobject": "3.0.1",
+            "liftoff": "2.5.0",
+            "matchdep": "2.0.0",
+            "mute-stdout": "1.0.0",
+            "pretty-hrtime": "1.0.3",
+            "replace-homedir": "1.0.0",
+            "semver-greatest-satisfied-range": "1.1.0",
+            "v8flags": "3.1.1",
+            "yargs": "7.1.0"
           }
         }
       }
@@ -5886,10 +6127,10 @@
       "integrity": "sha1-ucjin6N2s2xXmJ24IPwcFxW7R8s=",
       "dev": true,
       "requires": {
-        "plugin-error": "^1.0.1",
+        "plugin-error": "1.0.1",
         "replace-ext": "0.0.1",
-        "through2": "^2.0.0",
-        "vinyl-sourcemaps-apply": "^0.2.0"
+        "through2": "2.0.3",
+        "vinyl-sourcemaps-apply": "0.2.1"
       },
       "dependencies": {
         "extend-shallow": {
@@ -5898,8 +6139,8 @@
           "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
           "dev": true,
           "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
+            "assign-symbols": "1.0.0",
+            "is-extendable": "1.0.1"
           }
         },
         "is-extendable": {
@@ -5908,7 +6149,7 @@
           "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
           "dev": true,
           "requires": {
-            "is-plain-object": "^2.0.4"
+            "is-plain-object": "2.0.4"
           }
         },
         "isarray": {
@@ -5923,10 +6164,10 @@
           "integrity": "sha1-dwFr2JGdCsN3/c3QMiMolTyleBw=",
           "dev": true,
           "requires": {
-            "ansi-colors": "^1.0.1",
-            "arr-diff": "^4.0.0",
-            "arr-union": "^3.1.0",
-            "extend-shallow": "^3.0.2"
+            "ansi-colors": "1.1.0",
+            "arr-diff": "4.0.0",
+            "arr-union": "3.1.0",
+            "extend-shallow": "3.0.2"
           }
         },
         "process-nextick-args": {
@@ -5941,13 +6182,13 @@
           "integrity": "sha1-yUbD9H+n2Oq8C2FQ9KEvaaRXQHE=",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.0.3",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.0.3",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -5956,7 +6197,7 @@
           "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         },
         "through2": {
@@ -5965,8 +6206,8 @@
           "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
           "dev": true,
           "requires": {
-            "readable-stream": "^2.1.5",
-            "xtend": "~4.0.1"
+            "readable-stream": "2.3.4",
+            "xtend": "4.0.1"
           }
         },
         "xtend": {
@@ -5983,9 +6224,9 @@
       "integrity": "sha1-gSrQOITCT+BNkmQL7vUc/Un8RnU=",
       "dev": true,
       "requires": {
-        "gulp": "^3.9.1",
-        "plugin-error": "^0.1.2",
-        "through2": "^2.0.3"
+        "gulp": "3.9.1",
+        "plugin-error": "0.1.2",
+        "through2": "2.0.3"
       },
       "dependencies": {
         "clone": {
@@ -6000,10 +6241,10 @@
           "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=",
           "dev": true,
           "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^2.0.1",
-            "once": "^1.3.0"
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "2.0.10",
+            "once": "1.4.0"
           }
         },
         "glob-stream": {
@@ -6012,12 +6253,12 @@
           "integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=",
           "dev": true,
           "requires": {
-            "glob": "^4.3.1",
-            "glob2base": "^0.0.12",
-            "minimatch": "^2.0.1",
-            "ordered-read-streams": "^0.1.0",
-            "through2": "^0.6.1",
-            "unique-stream": "^1.0.0"
+            "glob": "4.5.3",
+            "glob2base": "0.0.12",
+            "minimatch": "2.0.10",
+            "ordered-read-streams": "0.1.0",
+            "through2": "0.6.5",
+            "unique-stream": "1.0.0"
           },
           "dependencies": {
             "isarray": {
@@ -6032,10 +6273,10 @@
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
               "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.1",
+                "core-util-is": "1.0.2",
+                "inherits": "2.0.3",
                 "isarray": "0.0.1",
-                "string_decoder": "~0.10.x"
+                "string_decoder": "0.10.31"
               }
             },
             "string_decoder": {
@@ -6050,8 +6291,8 @@
               "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
               "dev": true,
               "requires": {
-                "readable-stream": ">=1.0.33-1 <1.1.0-0",
-                "xtend": ">=4.0.0 <4.1.0-0"
+                "readable-stream": "1.0.34",
+                "xtend": "4.0.1"
               }
             }
           }
@@ -6062,7 +6303,7 @@
           "integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=",
           "dev": true,
           "requires": {
-            "gaze": "^0.5.1"
+            "gaze": "0.5.2"
           }
         },
         "graceful-fs": {
@@ -6071,7 +6312,7 @@
           "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=",
           "dev": true,
           "requires": {
-            "natives": "^1.1.0"
+            "natives": "1.1.4"
           }
         },
         "gulp": {
@@ -6080,19 +6321,19 @@
           "integrity": "sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=",
           "dev": true,
           "requires": {
-            "archy": "^1.0.0",
-            "chalk": "^1.0.0",
-            "deprecated": "^0.0.1",
-            "gulp-util": "^3.0.0",
-            "interpret": "^1.0.0",
-            "liftoff": "^2.1.0",
-            "minimist": "^1.1.0",
-            "orchestrator": "^0.3.0",
-            "pretty-hrtime": "^1.0.0",
-            "semver": "^4.1.0",
-            "tildify": "^1.0.0",
-            "v8flags": "^2.0.2",
-            "vinyl-fs": "^0.3.0"
+            "archy": "1.0.0",
+            "chalk": "1.1.3",
+            "deprecated": "0.0.1",
+            "gulp-util": "3.0.8",
+            "interpret": "1.1.0",
+            "liftoff": "2.5.0",
+            "minimist": "1.2.0",
+            "orchestrator": "0.3.8",
+            "pretty-hrtime": "1.0.3",
+            "semver": "4.3.6",
+            "tildify": "1.2.0",
+            "v8flags": "2.1.1",
+            "vinyl-fs": "0.3.14"
           }
         },
         "isarray": {
@@ -6107,7 +6348,7 @@
           "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
           "dev": true,
           "requires": {
-            "brace-expansion": "^1.0.0"
+            "brace-expansion": "1.1.11"
           }
         },
         "minimist": {
@@ -6134,13 +6375,13 @@
           "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.0.3",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.0.3",
+            "util-deprecate": "1.0.2"
           }
         },
         "semver": {
@@ -6155,7 +6396,7 @@
           "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         },
         "strip-bom": {
@@ -6164,8 +6405,8 @@
           "integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=",
           "dev": true,
           "requires": {
-            "first-chunk-stream": "^1.0.0",
-            "is-utf8": "^0.2.0"
+            "first-chunk-stream": "1.0.0",
+            "is-utf8": "0.2.1"
           }
         },
         "through2": {
@@ -6174,8 +6415,8 @@
           "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
           "dev": true,
           "requires": {
-            "readable-stream": "^2.1.5",
-            "xtend": "~4.0.1"
+            "readable-stream": "2.3.5",
+            "xtend": "4.0.1"
           }
         },
         "unique-stream": {
@@ -6190,7 +6431,7 @@
           "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
           "dev": true,
           "requires": {
-            "user-home": "^1.1.1"
+            "user-home": "1.1.1"
           }
         },
         "vinyl": {
@@ -6199,8 +6440,8 @@
           "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
           "dev": true,
           "requires": {
-            "clone": "^0.2.0",
-            "clone-stats": "^0.0.1"
+            "clone": "0.2.0",
+            "clone-stats": "0.0.1"
           }
         },
         "vinyl-fs": {
@@ -6209,14 +6450,14 @@
           "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=",
           "dev": true,
           "requires": {
-            "defaults": "^1.0.0",
-            "glob-stream": "^3.1.5",
-            "glob-watcher": "^0.0.6",
-            "graceful-fs": "^3.0.0",
-            "mkdirp": "^0.5.0",
-            "strip-bom": "^1.0.0",
-            "through2": "^0.6.1",
-            "vinyl": "^0.4.0"
+            "defaults": "1.0.3",
+            "glob-stream": "3.1.18",
+            "glob-watcher": "0.0.6",
+            "graceful-fs": "3.0.11",
+            "mkdirp": "0.5.1",
+            "strip-bom": "1.0.0",
+            "through2": "0.6.5",
+            "vinyl": "0.4.6"
           },
           "dependencies": {
             "isarray": {
@@ -6231,10 +6472,10 @@
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
               "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.1",
+                "core-util-is": "1.0.2",
+                "inherits": "2.0.3",
                 "isarray": "0.0.1",
-                "string_decoder": "~0.10.x"
+                "string_decoder": "0.10.31"
               }
             },
             "string_decoder": {
@@ -6249,8 +6490,8 @@
               "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
               "dev": true,
               "requires": {
-                "readable-stream": ">=1.0.33-1 <1.1.0-0",
-                "xtend": ">=4.0.0 <4.1.0-0"
+                "readable-stream": "1.0.34",
+                "xtend": "4.0.1"
               }
             }
           }
@@ -6269,8 +6510,8 @@
       "integrity": "sha1-RRNWoqxQicbbkaBEQlKgVDZXAGs=",
       "dev": true,
       "requires": {
-        "through2": "^0.4.1",
-        "vinyl": "^2.1.0"
+        "through2": "0.4.2",
+        "vinyl": "2.2.0"
       },
       "dependencies": {
         "clone": {
@@ -6291,10 +6532,10 @@
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
             "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
+            "string_decoder": "0.10.31"
           }
         },
         "replace-ext": {
@@ -6309,8 +6550,8 @@
           "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=",
           "dev": true,
           "requires": {
-            "readable-stream": "~1.0.17",
-            "xtend": "~2.1.1"
+            "readable-stream": "1.0.34",
+            "xtend": "2.1.2"
           }
         },
         "vinyl": {
@@ -6319,12 +6560,12 @@
           "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
           "dev": true,
           "requires": {
-            "clone": "^2.1.1",
-            "clone-buffer": "^1.0.0",
-            "clone-stats": "^1.0.0",
-            "cloneable-readable": "^1.0.0",
-            "remove-trailing-separator": "^1.0.1",
-            "replace-ext": "^1.0.0"
+            "clone": "2.1.1",
+            "clone-buffer": "1.0.0",
+            "clone-stats": "1.0.0",
+            "cloneable-readable": "1.0.0",
+            "remove-trailing-separator": "1.1.0",
+            "replace-ext": "1.0.0"
           }
         }
       }
@@ -6335,8 +6576,8 @@
       "integrity": "sha1-lOehtdQQJyDtvHSRZSosPW6MW7g=",
       "dev": true,
       "requires": {
-        "event-stream": "^3.1.7",
-        "plugin-error": "^0.1.2"
+        "event-stream": "3.3.4",
+        "plugin-error": "0.1.2"
       }
     },
     "gulp-json-editor": {
@@ -6345,11 +6586,11 @@
       "integrity": "sha1-YnTmEunxai2dEK6lC2TffhE/h9c=",
       "dev": true,
       "requires": {
-        "deepmerge": "^2.1.1",
-        "detect-indent": "^5.0.0",
-        "js-beautify": "^1.7.5",
-        "plugin-error": "^1.0.1",
-        "through2": "^2.0.3"
+        "deepmerge": "2.2.1",
+        "detect-indent": "5.0.0",
+        "js-beautify": "1.7.5",
+        "plugin-error": "1.0.1",
+        "through2": "2.0.3"
       },
       "dependencies": {
         "detect-indent": {
@@ -6364,8 +6605,8 @@
           "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
           "dev": true,
           "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
+            "assign-symbols": "1.0.0",
+            "is-extendable": "1.0.1"
           }
         },
         "is-extendable": {
@@ -6374,7 +6615,7 @@
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
           "requires": {
-            "is-plain-object": "^2.0.4"
+            "is-plain-object": "2.0.4"
           }
         },
         "isarray": {
@@ -6389,10 +6630,10 @@
           "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
           "dev": true,
           "requires": {
-            "ansi-colors": "^1.0.1",
-            "arr-diff": "^4.0.0",
-            "arr-union": "^3.1.0",
-            "extend-shallow": "^3.0.2"
+            "ansi-colors": "1.1.0",
+            "arr-diff": "4.0.0",
+            "arr-union": "3.1.0",
+            "extend-shallow": "3.0.2"
           }
         },
         "process-nextick-args": {
@@ -6407,13 +6648,13 @@
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -6422,7 +6663,7 @@
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         },
         "through2": {
@@ -6431,8 +6672,8 @@
           "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
           "dev": true,
           "requires": {
-            "readable-stream": "^2.1.5",
-            "xtend": "~4.0.1"
+            "readable-stream": "2.3.6",
+            "xtend": "4.0.1"
           }
         },
         "xtend": {
@@ -6461,24 +6702,24 @@
       "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
       "dev": true,
       "requires": {
-        "array-differ": "^1.0.0",
-        "array-uniq": "^1.0.2",
-        "beeper": "^1.0.0",
-        "chalk": "^1.0.0",
-        "dateformat": "^2.0.0",
-        "fancy-log": "^1.1.0",
-        "gulplog": "^1.0.0",
-        "has-gulplog": "^0.1.0",
-        "lodash._reescape": "^3.0.0",
-        "lodash._reevaluate": "^3.0.0",
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.template": "^3.0.0",
-        "minimist": "^1.1.0",
-        "multipipe": "^0.1.2",
-        "object-assign": "^3.0.0",
+        "array-differ": "1.0.0",
+        "array-uniq": "1.0.3",
+        "beeper": "1.1.1",
+        "chalk": "1.1.3",
+        "dateformat": "2.2.0",
+        "fancy-log": "1.3.2",
+        "gulplog": "1.0.0",
+        "has-gulplog": "0.1.0",
+        "lodash._reescape": "3.0.0",
+        "lodash._reevaluate": "3.0.0",
+        "lodash._reinterpolate": "3.0.0",
+        "lodash.template": "3.6.2",
+        "minimist": "1.2.0",
+        "multipipe": "0.1.2",
+        "object-assign": "3.0.0",
         "replace-ext": "0.0.1",
-        "through2": "^2.0.0",
-        "vinyl": "^0.5.0"
+        "through2": "2.0.3",
+        "vinyl": "0.5.3"
       },
       "dependencies": {
         "isarray": {
@@ -6505,13 +6746,13 @@
           "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~1.0.6",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.0.3",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.0.3",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -6520,7 +6761,7 @@
           "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         },
         "through2": {
@@ -6529,8 +6770,8 @@
           "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
           "dev": true,
           "requires": {
-            "readable-stream": "^2.1.5",
-            "xtend": "~4.0.1"
+            "readable-stream": "2.3.3",
+            "xtend": "4.0.1"
           }
         },
         "xtend": {
@@ -6548,17 +6789,17 @@
       "dev": true,
       "requires": {
         "ansi-colors": "1.1.0",
-        "anymatch": "^1.3.0",
-        "chokidar": "^2.0.0",
+        "anymatch": "1.3.2",
+        "chokidar": "2.0.2",
         "fancy-log": "1.3.2",
-        "glob-parent": "^3.0.1",
-        "object-assign": "^4.1.0",
-        "path-is-absolute": "^1.0.1",
+        "glob-parent": "3.1.0",
+        "object-assign": "4.1.1",
+        "path-is-absolute": "1.0.1",
         "plugin-error": "1.0.1",
-        "readable-stream": "^2.2.2",
-        "slash": "^1.0.0",
-        "vinyl": "^2.1.0",
-        "vinyl-file": "^2.0.0"
+        "readable-stream": "2.3.6",
+        "slash": "1.0.0",
+        "vinyl": "2.2.0",
+        "vinyl-file": "2.0.0"
       },
       "dependencies": {
         "clone": {
@@ -6579,8 +6820,8 @@
           "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
           "dev": true,
           "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
+            "assign-symbols": "1.0.0",
+            "is-extendable": "1.0.1"
           }
         },
         "is-extendable": {
@@ -6589,7 +6830,7 @@
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
           "requires": {
-            "is-plain-object": "^2.0.4"
+            "is-plain-object": "2.0.4"
           }
         },
         "isarray": {
@@ -6604,10 +6845,10 @@
           "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
           "dev": true,
           "requires": {
-            "ansi-colors": "^1.0.1",
-            "arr-diff": "^4.0.0",
-            "arr-union": "^3.1.0",
-            "extend-shallow": "^3.0.2"
+            "ansi-colors": "1.1.0",
+            "arr-diff": "4.0.0",
+            "arr-union": "3.1.0",
+            "extend-shallow": "3.0.2"
           }
         },
         "process-nextick-args": {
@@ -6622,13 +6863,13 @@
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         },
         "replace-ext": {
@@ -6643,7 +6884,7 @@
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         },
         "vinyl": {
@@ -6652,12 +6893,12 @@
           "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
           "dev": true,
           "requires": {
-            "clone": "^2.1.1",
-            "clone-buffer": "^1.0.0",
-            "clone-stats": "^1.0.0",
-            "cloneable-readable": "^1.0.0",
-            "remove-trailing-separator": "^1.0.1",
-            "replace-ext": "^1.0.0"
+            "clone": "2.1.1",
+            "clone-buffer": "1.0.0",
+            "clone-stats": "1.0.0",
+            "cloneable-readable": "1.0.0",
+            "remove-trailing-separator": "1.1.0",
+            "replace-ext": "1.0.0"
           }
         }
       }
@@ -6668,7 +6909,7 @@
       "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
       "dev": true,
       "requires": {
-        "glogg": "^1.0.0"
+        "glogg": "1.0.0"
       }
     },
     "har-schema": {
@@ -6681,8 +6922,8 @@
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
       "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
       "requires": {
-        "ajv": "^5.1.0",
-        "har-schema": "^2.0.0"
+        "ajv": "5.5.2",
+        "har-schema": "2.0.0"
       }
     },
     "has": {
@@ -6691,7 +6932,7 @@
       "integrity": "sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y=",
       "dev": true,
       "requires": {
-        "function-bind": "^1.1.1"
+        "function-bind": "1.1.1"
       }
     },
     "has-ansi": {
@@ -6699,7 +6940,7 @@
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
       "requires": {
-        "ansi-regex": "^2.0.0"
+        "ansi-regex": "2.1.1"
       }
     },
     "has-flag": {
@@ -6714,7 +6955,7 @@
       "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
       "dev": true,
       "requires": {
-        "sparkles": "^1.0.0"
+        "sparkles": "1.0.0"
       }
     },
     "has-symbols": {
@@ -6734,9 +6975,9 @@
       "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
       "dev": true,
       "requires": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
+        "get-value": "2.0.6",
+        "has-values": "1.0.0",
+        "isobject": "3.0.1"
       }
     },
     "has-values": {
@@ -6745,8 +6986,8 @@
       "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
       "dev": true,
       "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
+        "is-number": "3.0.0",
+        "kind-of": "4.0.0"
       },
       "dependencies": {
         "kind-of": {
@@ -6755,7 +6996,7 @@
           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -6766,8 +7007,8 @@
       "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.1"
       }
     },
     "hash-sum": {
@@ -6782,8 +7023,8 @@
       "integrity": "sha512-A6RlQvvZEtFS5fLU43IDu0QUmBy+fDO9VMdTXvufKwIkt/rFfvICAViCax5fbDO4zdNzaC3/27ZhKUok5bAJyw==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.0"
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1"
       }
     },
     "he": {
@@ -6798,9 +7039,9 @@
       "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
       "dev": true,
       "requires": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
+        "hash.js": "1.1.4",
+        "minimalistic-assert": "1.0.1",
+        "minimalistic-crypto-utils": "1.0.1"
       }
     },
     "home-or-tmp": {
@@ -6809,8 +7050,8 @@
       "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
       "dev": true,
       "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.1"
+        "os-homedir": "1.0.2",
+        "os-tmpdir": "1.0.2"
       }
     },
     "homedir-polyfill": {
@@ -6819,7 +7060,7 @@
       "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=",
       "dev": true,
       "requires": {
-        "parse-passwd": "^1.0.0"
+        "parse-passwd": "1.0.0"
       }
     },
     "hosted-git-info": {
@@ -6839,13 +7080,13 @@
       "integrity": "sha512-sczoq/9zeXiKZMj8tsQzHJE7EyjrpMHvblTLuh9o8h5923a6Ts5uQ/3YdY+xIqJYRjzHQPlrHjfjh0BtwPJG0g==",
       "dev": true,
       "requires": {
-        "camel-case": "3.0.x",
-        "clean-css": "4.1.x",
-        "commander": "2.16.x",
-        "he": "1.1.x",
-        "param-case": "2.1.x",
-        "relateurl": "0.2.x",
-        "uglify-js": "3.4.x"
+        "camel-case": "3.0.0",
+        "clean-css": "4.1.11",
+        "commander": "2.16.0",
+        "he": "1.1.1",
+        "param-case": "2.1.1",
+        "relateurl": "0.2.7",
+        "uglify-js": "3.4.3"
       },
       "dependencies": {
         "commander": {
@@ -6862,12 +7103,12 @@
       "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=",
       "dev": true,
       "requires": {
-        "html-minifier": "^3.2.3",
-        "loader-utils": "^0.2.16",
-        "lodash": "^4.17.3",
-        "pretty-error": "^2.0.2",
-        "tapable": "^1.0.0",
-        "toposort": "^1.0.0",
+        "html-minifier": "3.5.18",
+        "loader-utils": "0.2.17",
+        "lodash": "4.17.11",
+        "pretty-error": "2.1.1",
+        "tapable": "1.0.0",
+        "toposort": "1.0.7",
         "util.promisify": "1.0.0"
       },
       "dependencies": {
@@ -6877,10 +7118,10 @@
           "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
           "dev": true,
           "requires": {
-            "big.js": "^3.1.3",
-            "emojis-list": "^2.0.0",
-            "json5": "^0.5.0",
-            "object-assign": "^4.0.1"
+            "big.js": "3.2.0",
+            "emojis-list": "2.1.0",
+            "json5": "0.5.1",
+            "object-assign": "4.1.1"
           }
         }
       }
@@ -6891,10 +7132,10 @@
       "integrity": "sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=",
       "dev": true,
       "requires": {
-        "domelementtype": "1",
-        "domhandler": "2.1",
-        "domutils": "1.1",
-        "readable-stream": "1.0"
+        "domelementtype": "1.3.0",
+        "domhandler": "2.1.0",
+        "domutils": "1.1.6",
+        "readable-stream": "1.0.34"
       },
       "dependencies": {
         "domutils": {
@@ -6903,7 +7144,7 @@
           "integrity": "sha1-vdw94Jm5ou+sxRxiPyj0FuzFdIU=",
           "dev": true,
           "requires": {
-            "domelementtype": "1"
+            "domelementtype": "1.3.0"
           }
         },
         "readable-stream": {
@@ -6912,10 +7153,10 @@
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
             "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
+            "string_decoder": "0.10.31"
           }
         }
       }
@@ -6925,9 +7166,9 @@
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
       "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
       "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
+        "assert-plus": "1.0.0",
+        "jsprim": "1.4.1",
+        "sshpk": "1.13.1"
       }
     },
     "https-browserify": {
@@ -6942,7 +7183,7 @@
       "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
       "dev": true,
       "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
+        "safer-buffer": "2.1.2"
       }
     },
     "icss-replace-symbols": {
@@ -6957,7 +7198,7 @@
       "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=",
       "dev": true,
       "requires": {
-        "postcss": "^6.0.1"
+        "postcss": "6.0.23"
       },
       "dependencies": {
         "ansi-styles": {
@@ -6966,7 +7207,7 @@
           "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=",
           "dev": true,
           "requires": {
-            "color-convert": "^1.9.0"
+            "color-convert": "1.9.2"
           }
         },
         "chalk": {
@@ -6975,9 +7216,9 @@
           "integrity": "sha1-GMSasWoDe26wFSzIPjRxM4IVtm4=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
           }
         },
         "has-flag": {
@@ -6992,9 +7233,9 @@
           "integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
+            "chalk": "2.4.1",
+            "source-map": "0.6.1",
+            "supports-color": "5.4.0"
           }
         },
         "source-map": {
@@ -7009,7 +7250,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -7053,7 +7294,7 @@
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
       "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
       "requires": {
-        "repeating": "^2.0.0"
+        "repeating": "2.0.1"
       }
     },
     "indexes-of": {
@@ -7073,8 +7314,8 @@
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+        "once": "1.4.0",
+        "wrappy": "1.0.2"
       }
     },
     "inherits": {
@@ -7093,20 +7334,20 @@
       "integrity": "sha1-ndLyrXZdyrH/BEO0kUQqILoifck=",
       "dev": true,
       "requires": {
-        "ansi-escapes": "^3.0.0",
-        "chalk": "^2.0.0",
-        "cli-cursor": "^2.1.0",
-        "cli-width": "^2.0.0",
-        "external-editor": "^2.0.4",
-        "figures": "^2.0.0",
-        "lodash": "^4.3.0",
+        "ansi-escapes": "3.1.0",
+        "chalk": "2.4.1",
+        "cli-cursor": "2.1.0",
+        "cli-width": "2.2.0",
+        "external-editor": "2.2.0",
+        "figures": "2.0.0",
+        "lodash": "4.17.11",
         "mute-stream": "0.0.7",
-        "run-async": "^2.2.0",
-        "rx-lite": "^4.0.8",
-        "rx-lite-aggregates": "^4.0.8",
-        "string-width": "^2.1.0",
-        "strip-ansi": "^4.0.0",
-        "through": "^2.3.6"
+        "run-async": "2.3.0",
+        "rx-lite": "4.0.8",
+        "rx-lite-aggregates": "4.0.8",
+        "string-width": "2.1.1",
+        "strip-ansi": "4.0.0",
+        "through": "2.3.8"
       },
       "dependencies": {
         "ansi-regex": {
@@ -7121,7 +7362,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "^1.9.0"
+            "color-convert": "1.9.2"
           }
         },
         "chalk": {
@@ -7130,9 +7371,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
           }
         },
         "has-flag": {
@@ -7153,8 +7394,8 @@
           "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
           }
         },
         "strip-ansi": {
@@ -7163,7 +7404,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "3.0.0"
           }
         },
         "supports-color": {
@@ -7172,7 +7413,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -7189,7 +7430,7 @@
       "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
       "dev": true,
       "requires": {
-        "loose-envify": "^1.0.0"
+        "loose-envify": "1.3.1"
       }
     },
     "invert-kv": {
@@ -7203,8 +7444,8 @@
       "integrity": "sha1-OV4a6EsR8mrReV5zwXN45IowFXY=",
       "dev": true,
       "requires": {
-        "is-relative": "^1.0.0",
-        "is-windows": "^1.0.1"
+        "is-relative": "1.0.0",
+        "is-windows": "1.0.2"
       }
     },
     "is-absolute-url": {
@@ -7219,7 +7460,7 @@
       "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
       "dev": true,
       "requires": {
-        "kind-of": "^6.0.0"
+        "kind-of": "6.0.2"
       }
     },
     "is-arrayish": {
@@ -7233,7 +7474,7 @@
       "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
       "dev": true,
       "requires": {
-        "binary-extensions": "^1.0.0"
+        "binary-extensions": "1.11.0"
       }
     },
     "is-buffer": {
@@ -7247,7 +7488,7 @@
       "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
       "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
       "requires": {
-        "builtin-modules": "^1.0.0"
+        "builtin-modules": "1.1.1"
       }
     },
     "is-callable": {
@@ -7262,7 +7503,7 @@
       "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
       "dev": true,
       "requires": {
-        "kind-of": "^6.0.0"
+        "kind-of": "6.0.2"
       }
     },
     "is-date-object": {
@@ -7277,9 +7518,9 @@
       "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
       "dev": true,
       "requires": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
+        "is-accessor-descriptor": "1.0.0",
+        "is-data-descriptor": "1.0.0",
+        "kind-of": "6.0.2"
       }
     },
     "is-directory": {
@@ -7300,7 +7541,7 @@
       "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
       "dev": true,
       "requires": {
-        "is-primitive": "^2.0.0"
+        "is-primitive": "2.0.0"
       }
     },
     "is-extendable": {
@@ -7320,7 +7561,7 @@
       "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
       "requires": {
-        "number-is-nan": "^1.0.0"
+        "number-is-nan": "1.0.1"
       }
     },
     "is-fullwidth-code-point": {
@@ -7328,7 +7569,7 @@
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
       "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
       "requires": {
-        "number-is-nan": "^1.0.0"
+        "number-is-nan": "1.0.1"
       }
     },
     "is-glob": {
@@ -7337,7 +7578,7 @@
       "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
       "dev": true,
       "requires": {
-        "is-extglob": "^2.1.0"
+        "is-extglob": "2.1.1"
       }
     },
     "is-my-ip-valid": {
@@ -7352,11 +7593,11 @@
       "integrity": "sha1-j9bkA2PNBrlj+od9REv7Xt3GIXU=",
       "dev": true,
       "requires": {
-        "generate-function": "^2.0.0",
-        "generate-object-property": "^1.1.0",
-        "is-my-ip-valid": "^1.0.0",
-        "jsonpointer": "^4.0.0",
-        "xtend": "^4.0.0"
+        "generate-function": "2.0.0",
+        "generate-object-property": "1.2.0",
+        "is-my-ip-valid": "1.0.0",
+        "jsonpointer": "4.0.1",
+        "xtend": "4.0.1"
       },
       "dependencies": {
         "xtend": {
@@ -7379,7 +7620,7 @@
       "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2"
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "kind-of": {
@@ -7388,7 +7629,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -7399,7 +7640,7 @@
       "integrity": "sha1-O4qTLrAos3dcObsJ6RdnrM22kIg=",
       "dev": true,
       "requires": {
-        "is-number": "^3.0.0"
+        "is-number": "3.0.0"
       }
     },
     "is-path-cwd": {
@@ -7414,7 +7655,7 @@
       "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
       "dev": true,
       "requires": {
-        "is-path-inside": "^1.0.0"
+        "is-path-inside": "1.0.1"
       }
     },
     "is-path-inside": {
@@ -7423,7 +7664,7 @@
       "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
       "dev": true,
       "requires": {
-        "path-is-inside": "^1.0.1"
+        "path-is-inside": "1.0.2"
       }
     },
     "is-plain-obj": {
@@ -7438,7 +7679,7 @@
       "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=",
       "dev": true,
       "requires": {
-        "isobject": "^3.0.1"
+        "isobject": "3.0.1"
       }
     },
     "is-posix-bracket": {
@@ -7471,7 +7712,7 @@
       "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
       "dev": true,
       "requires": {
-        "has": "^1.0.1"
+        "has": "1.0.3"
       }
     },
     "is-relative": {
@@ -7480,7 +7721,7 @@
       "integrity": "sha1-obtpNc6MXboei5dUubLcwCDiJg0=",
       "dev": true,
       "requires": {
-        "is-unc-path": "^1.0.0"
+        "is-unc-path": "1.0.0"
       }
     },
     "is-resolvable": {
@@ -7501,7 +7742,7 @@
       "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=",
       "dev": true,
       "requires": {
-        "html-comment-regex": "^1.1.0"
+        "html-comment-regex": "1.1.1"
       }
     },
     "is-symbol": {
@@ -7521,7 +7762,7 @@
       "integrity": "sha1-1zHoiY7QkKEsNSrS6u1Qla0yLJ0=",
       "dev": true,
       "requires": {
-        "unc-path-regex": "^0.1.2"
+        "unc-path-regex": "0.1.2"
       }
     },
     "is-utf8": {
@@ -7579,10 +7820,10 @@
       "integrity": "sha1-adllHvYNu2SfZVJ7U2dJUBOKeRk=",
       "dev": true,
       "requires": {
-        "config-chain": "~1.1.5",
-        "editorconfig": "^0.13.2",
-        "mkdirp": "~0.5.0",
-        "nopt": "~3.0.1"
+        "config-chain": "1.1.11",
+        "editorconfig": "0.13.3",
+        "mkdirp": "0.5.1",
+        "nopt": "3.0.6"
       }
     },
     "js-tokens": {
@@ -7597,8 +7838,8 @@
       "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=",
       "dev": true,
       "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^2.6.0"
+        "argparse": "1.0.10",
+        "esprima": "2.7.3"
       }
     },
     "jsbn": {
@@ -7635,7 +7876,7 @@
       "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
       "dev": true,
       "requires": {
-        "jsonify": "~0.0.0"
+        "jsonify": "0.0.0"
       }
     },
     "json-stable-stringify-without-jsonify": {
@@ -7660,7 +7901,7 @@
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
       "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
       "requires": {
-        "graceful-fs": "^4.1.6"
+        "graceful-fs": "4.1.11"
       }
     },
     "jsonify": {
@@ -7698,7 +7939,7 @@
       "integrity": "sha512-pd++/v+fS0LQKmzWlW6R1lziTXFqhfGeS6sYLfuTIqEy2pDzAbjutbSW8f9tnJdEEMn/9XhAQlT34VAtl9h4MQ==",
       "requires": {
         "nan": "2.8.0",
-        "prebuild-install": "^5.0.0"
+        "prebuild-install": "5.2.1"
       }
     },
     "kind-of": {
@@ -7712,7 +7953,7 @@
       "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
       "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
       "requires": {
-        "graceful-fs": "^4.1.9"
+        "graceful-fs": "4.1.11"
       }
     },
     "known-css-properties": {
@@ -7727,8 +7968,8 @@
       "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
       "dev": true,
       "requires": {
-        "default-resolution": "^2.0.0",
-        "es6-weak-map": "^2.0.1"
+        "default-resolution": "2.0.0",
+        "es6-weak-map": "2.0.2"
       }
     },
     "lazy-cache": {
@@ -7737,7 +7978,7 @@
       "integrity": "sha1-uRkKT5EzVGlIQIWfio9whNiCImQ=",
       "dev": true,
       "requires": {
-        "set-getter": "^0.1.0"
+        "set-getter": "0.1.0"
       }
     },
     "lazystream": {
@@ -7746,7 +7987,7 @@
       "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
       "dev": true,
       "requires": {
-        "readable-stream": "^2.0.5"
+        "readable-stream": "2.3.5"
       },
       "dependencies": {
         "isarray": {
@@ -7767,13 +8008,13 @@
           "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.0.3",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.0.3",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -7782,7 +8023,7 @@
           "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         }
       }
@@ -7792,7 +8033,7 @@
       "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
       "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
       "requires": {
-        "invert-kv": "^1.0.0"
+        "invert-kv": "1.0.0"
       }
     },
     "lead": {
@@ -7801,7 +8042,7 @@
       "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
       "dev": true,
       "requires": {
-        "flush-write-stream": "^1.0.2"
+        "flush-write-stream": "1.0.3"
       }
     },
     "levn": {
@@ -7810,8 +8051,8 @@
       "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
       "dev": true,
       "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2"
       }
     },
     "lie": {
@@ -7819,7 +8060,7 @@
       "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
       "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=",
       "requires": {
-        "immediate": "~3.0.5"
+        "immediate": "3.0.6"
       }
     },
     "liftoff": {
@@ -7828,14 +8069,14 @@
       "integrity": "sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=",
       "dev": true,
       "requires": {
-        "extend": "^3.0.0",
-        "findup-sync": "^2.0.0",
-        "fined": "^1.0.1",
-        "flagged-respawn": "^1.0.0",
-        "is-plain-object": "^2.0.4",
-        "object.map": "^1.0.0",
-        "rechoir": "^0.6.2",
-        "resolve": "^1.1.7"
+        "extend": "3.0.1",
+        "findup-sync": "2.0.0",
+        "fined": "1.1.0",
+        "flagged-respawn": "1.0.0",
+        "is-plain-object": "2.0.4",
+        "object.map": "1.0.1",
+        "rechoir": "0.6.2",
+        "resolve": "1.5.0"
       }
     },
     "load-json-file": {
@@ -7843,11 +8084,11 @@
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
+        "graceful-fs": "4.1.11",
+        "parse-json": "2.2.0",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1",
+        "strip-bom": "2.0.0"
       },
       "dependencies": {
         "pify": {
@@ -7869,9 +8110,9 @@
       "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
       "dev": true,
       "requires": {
-        "big.js": "^3.1.3",
-        "emojis-list": "^2.0.0",
-        "json5": "^0.5.0"
+        "big.js": "3.2.0",
+        "emojis-list": "2.1.0",
+        "json5": "0.5.1"
       }
     },
     "localforage": {
@@ -7888,8 +8129,8 @@
       "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
       "dev": true,
       "requires": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
+        "p-locate": "2.0.0",
+        "path-exists": "3.0.0"
       }
     },
     "lodash": {
@@ -7973,15 +8214,33 @@
       "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
       "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
     },
+    "lodash.defaults": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
+      "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=",
+      "dev": true
+    },
+    "lodash.difference": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz",
+      "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=",
+      "dev": true
+    },
     "lodash.escape": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
       "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
       "dev": true,
       "requires": {
-        "lodash._root": "^3.0.0"
+        "lodash._root": "3.0.1"
       }
     },
+    "lodash.flatten": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
+      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
+      "dev": true
+    },
     "lodash.isarguments": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
@@ -7994,6 +8253,12 @@
       "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
       "dev": true
     },
+    "lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
+      "dev": true
+    },
     "lodash.kebabcase": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz",
@@ -8006,9 +8271,9 @@
       "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
       "dev": true,
       "requires": {
-        "lodash._getnative": "^3.0.0",
-        "lodash.isarguments": "^3.0.0",
-        "lodash.isarray": "^3.0.0"
+        "lodash._getnative": "3.9.1",
+        "lodash.isarguments": "3.1.0",
+        "lodash.isarray": "3.0.4"
       }
     },
     "lodash.memoize": {
@@ -8046,15 +8311,15 @@
       "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
       "dev": true,
       "requires": {
-        "lodash._basecopy": "^3.0.0",
-        "lodash._basetostring": "^3.0.0",
-        "lodash._basevalues": "^3.0.0",
-        "lodash._isiterateecall": "^3.0.0",
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.escape": "^3.0.0",
-        "lodash.keys": "^3.0.0",
-        "lodash.restparam": "^3.0.0",
-        "lodash.templatesettings": "^3.0.0"
+        "lodash._basecopy": "3.0.1",
+        "lodash._basetostring": "3.0.1",
+        "lodash._basevalues": "3.0.0",
+        "lodash._isiterateecall": "3.0.9",
+        "lodash._reinterpolate": "3.0.0",
+        "lodash.escape": "3.2.0",
+        "lodash.keys": "3.1.2",
+        "lodash.restparam": "3.6.1",
+        "lodash.templatesettings": "3.1.1"
       }
     },
     "lodash.templatesettings": {
@@ -8063,8 +8328,8 @@
       "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
       "dev": true,
       "requires": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.escape": "^3.0.0"
+        "lodash._reinterpolate": "3.0.0",
+        "lodash.escape": "3.2.0"
       }
     },
     "lodash.throttle": {
@@ -8073,6 +8338,18 @@
       "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=",
       "dev": true
     },
+    "lodash.toarray": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz",
+      "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE=",
+      "dev": true
+    },
+    "lodash.union": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz",
+      "integrity": "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=",
+      "dev": true
+    },
     "lodash.uniq": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
@@ -8085,7 +8362,7 @@
       "integrity": "sha1-V0Dhxdbw39pK2TI7UzIQfva0xAo=",
       "dev": true,
       "requires": {
-        "chalk": "^2.0.1"
+        "chalk": "2.4.1"
       },
       "dependencies": {
         "ansi-styles": {
@@ -8094,7 +8371,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "^1.9.0"
+            "color-convert": "1.9.2"
           }
         },
         "chalk": {
@@ -8103,9 +8380,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
           }
         },
         "has-flag": {
@@ -8120,7 +8397,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -8137,7 +8414,7 @@
       "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
       "dev": true,
       "requires": {
-        "js-tokens": "^3.0.0"
+        "js-tokens": "3.0.2"
       }
     },
     "loud-rejection": {
@@ -8145,8 +8422,8 @@
       "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
       "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
       "requires": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
+        "currently-unhandled": "0.4.1",
+        "signal-exit": "3.0.2"
       }
     },
     "lower-case": {
@@ -8167,7 +8444,7 @@
       "integrity": "sha1-ecEDO4BRW9bSTsmTPoYMp17ifww=",
       "dev": true,
       "requires": {
-        "pify": "^3.0.0"
+        "pify": "3.0.0"
       }
     },
     "make-iterator": {
@@ -8176,7 +8453,7 @@
       "integrity": "sha1-KbM/MSqo9UfEpeSQ9Wr87JkTOtY=",
       "dev": true,
       "requires": {
-        "kind-of": "^6.0.2"
+        "kind-of": "6.0.2"
       }
     },
     "map-cache": {
@@ -8202,7 +8479,7 @@
       "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
       "dev": true,
       "requires": {
-        "object-visit": "^1.0.0"
+        "object-visit": "1.0.1"
       }
     },
     "matchdep": {
@@ -8211,9 +8488,9 @@
       "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
       "dev": true,
       "requires": {
-        "findup-sync": "^2.0.0",
-        "micromatch": "^3.0.4",
-        "resolve": "^1.4.0",
+        "findup-sync": "2.0.0",
+        "micromatch": "3.1.5",
+        "resolve": "1.5.0",
         "stack-trace": "0.0.10"
       }
     },
@@ -8241,8 +8518,8 @@
       "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
       "dev": true,
       "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
+        "hash-base": "3.0.4",
+        "inherits": "2.0.3"
       }
     },
     "mem": {
@@ -8251,7 +8528,7 @@
       "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
       "dev": true,
       "requires": {
-        "mimic-fn": "^1.0.0"
+        "mimic-fn": "1.2.0"
       }
     },
     "memory-fs": {
@@ -8260,8 +8537,8 @@
       "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
       "dev": true,
       "requires": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
+        "errno": "0.1.7",
+        "readable-stream": "2.3.6"
       },
       "dependencies": {
         "isarray": {
@@ -8282,13 +8559,13 @@
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -8297,7 +8574,7 @@
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         }
       }
@@ -8307,16 +8584,16 @@
       "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
       "requires": {
-        "camelcase-keys": "^2.0.0",
-        "decamelize": "^1.1.2",
-        "loud-rejection": "^1.0.0",
-        "map-obj": "^1.0.1",
-        "minimist": "^1.1.3",
-        "normalize-package-data": "^2.3.4",
-        "object-assign": "^4.0.1",
-        "read-pkg-up": "^1.0.1",
-        "redent": "^1.0.0",
-        "trim-newlines": "^1.0.0"
+        "camelcase-keys": "2.1.0",
+        "decamelize": "1.2.0",
+        "loud-rejection": "1.6.0",
+        "map-obj": "1.0.1",
+        "minimist": "1.2.0",
+        "normalize-package-data": "2.4.0",
+        "object-assign": "4.1.1",
+        "read-pkg-up": "1.0.1",
+        "redent": "1.0.0",
+        "trim-newlines": "1.0.0"
       },
       "dependencies": {
         "minimist": {
@@ -8338,19 +8615,19 @@
       "integrity": "sha1-0F4WjCBkct+8qYW/709XeXtM1Lo=",
       "dev": true,
       "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.0",
-        "define-property": "^1.0.0",
-        "extend-shallow": "^2.0.1",
-        "extglob": "^2.0.2",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.0",
-        "nanomatch": "^1.2.5",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "arr-diff": "4.0.0",
+        "array-unique": "0.3.2",
+        "braces": "2.3.1",
+        "define-property": "1.0.0",
+        "extend-shallow": "2.0.1",
+        "extglob": "2.0.4",
+        "fragment-cache": "0.2.1",
+        "kind-of": "6.0.2",
+        "nanomatch": "1.2.7",
+        "object.pick": "1.3.0",
+        "regex-not": "1.0.0",
+        "snapdragon": "0.8.1",
+        "to-regex": "3.0.1"
       }
     },
     "miller-rabin": {
@@ -8359,8 +8636,8 @@
       "integrity": "sha1-8IA1HIZbDcViqEYpZtqlNUPHik0=",
       "dev": true,
       "requires": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
+        "bn.js": "4.11.8",
+        "brorand": "1.1.0"
       }
     },
     "mime-db": {
@@ -8373,7 +8650,7 @@
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
       "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
       "requires": {
-        "mime-db": "~1.30.0"
+        "mime-db": "1.30.0"
       }
     },
     "mimic-fn": {
@@ -8404,7 +8681,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
       "requires": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "1.1.11"
       }
     },
     "minimist": {
@@ -8418,16 +8695,16 @@
       "integrity": "sha1-NEKlCPr8KFAEhv7qmUCWduTuWm8=",
       "dev": true,
       "requires": {
-        "concat-stream": "^1.5.0",
-        "duplexify": "^3.4.2",
-        "end-of-stream": "^1.1.0",
-        "flush-write-stream": "^1.0.0",
-        "from2": "^2.1.0",
-        "parallel-transform": "^1.1.0",
-        "pump": "^2.0.1",
-        "pumpify": "^1.3.3",
-        "stream-each": "^1.1.0",
-        "through2": "^2.0.0"
+        "concat-stream": "1.6.0",
+        "duplexify": "3.5.4",
+        "end-of-stream": "1.4.1",
+        "flush-write-stream": "1.0.3",
+        "from2": "2.3.0",
+        "parallel-transform": "1.1.0",
+        "pump": "2.0.1",
+        "pumpify": "1.4.0",
+        "stream-each": "1.2.2",
+        "through2": "2.0.3"
       },
       "dependencies": {
         "isarray": {
@@ -8448,8 +8725,8 @@
           "integrity": "sha1-Ejma3W5M91Jtlzy8i1zi4pCLOQk=",
           "dev": true,
           "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
+            "end-of-stream": "1.4.1",
+            "once": "1.4.0"
           }
         },
         "readable-stream": {
@@ -8458,13 +8735,13 @@
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -8473,7 +8750,7 @@
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         },
         "through2": {
@@ -8482,8 +8759,8 @@
           "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
           "dev": true,
           "requires": {
-            "readable-stream": "^2.1.5",
-            "xtend": "~4.0.1"
+            "readable-stream": "2.3.6",
+            "xtend": "4.0.1"
           }
         },
         "xtend": {
@@ -8500,8 +8777,8 @@
       "integrity": "sha1-R6hzK6l3mUV8jB7KKPlRMtfoFQo=",
       "dev": true,
       "requires": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
+        "for-in": "1.0.2",
+        "is-extendable": "1.0.1"
       },
       "dependencies": {
         "is-extendable": {
@@ -8510,7 +8787,7 @@
           "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
           "dev": true,
           "requires": {
-            "is-plain-object": "^2.0.4"
+            "is-plain-object": "2.0.4"
           }
         }
       }
@@ -8521,8 +8798,8 @@
       "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
       "dev": true,
       "requires": {
-        "for-in": "^0.1.3",
-        "is-extendable": "^0.1.1"
+        "for-in": "0.1.8",
+        "is-extendable": "0.1.1"
       },
       "dependencies": {
         "for-in": {
@@ -8553,7 +8830,7 @@
       "requires": {
         "decompress-zip": "0.3.0",
         "fs-extra": "0.26.7",
-        "request": "^2.79.0"
+        "request": "2.87.0"
       },
       "dependencies": {
         "fs-extra": {
@@ -8561,11 +8838,11 @@
           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz",
           "integrity": "sha1-muH92UiXeY7at20JGM9C0MMYT6k=",
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^2.1.0",
-            "klaw": "^1.0.0",
-            "path-is-absolute": "^1.0.0",
-            "rimraf": "^2.2.8"
+            "graceful-fs": "4.1.11",
+            "jsonfile": "2.4.0",
+            "klaw": "1.3.1",
+            "path-is-absolute": "1.0.1",
+            "rimraf": "2.6.2"
           }
         },
         "jsonfile": {
@@ -8573,7 +8850,7 @@
           "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
           "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
           "requires": {
-            "graceful-fs": "^4.1.6"
+            "graceful-fs": "4.1.11"
           }
         }
       }
@@ -8584,12 +8861,12 @@
       "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
       "dev": true,
       "requires": {
-        "aproba": "^1.1.1",
-        "copy-concurrently": "^1.0.0",
-        "fs-write-stream-atomic": "^1.0.8",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.3"
+        "aproba": "1.2.0",
+        "copy-concurrently": "1.0.5",
+        "fs-write-stream-atomic": "1.0.10",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2",
+        "run-queue": "1.0.3"
       }
     },
     "ms": {
@@ -8630,17 +8907,17 @@
       "integrity": "sha1-U81KoQn/aLf4aVkf3J0Q2u7qPnk=",
       "dev": true,
       "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "is-odd": "^1.0.0",
-        "kind-of": "^5.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "arr-diff": "4.0.0",
+        "array-unique": "0.3.2",
+        "define-property": "1.0.0",
+        "extend-shallow": "2.0.1",
+        "fragment-cache": "0.2.1",
+        "is-odd": "1.0.0",
+        "kind-of": "5.1.0",
+        "object.pick": "1.3.0",
+        "regex-not": "1.0.0",
+        "snapdragon": "0.8.1",
+        "to-regex": "3.0.1"
       },
       "dependencies": {
         "kind-of": {
@@ -8675,9 +8952,9 @@
       "requires": {
         "async": "0.2.10",
         "binary-search-tree": "0.2.5",
-        "localforage": "^1.3.0",
-        "mkdirp": "~0.5.1",
-        "underscore": "~1.4.4"
+        "localforage": "1.6.0",
+        "mkdirp": "0.5.1",
+        "underscore": "1.4.4"
       },
       "dependencies": {
         "async": {
@@ -8699,7 +8976,7 @@
       "integrity": "sha1-YLgTOWvjmz8SiKTB7V0efSi0ZKw=",
       "dev": true,
       "requires": {
-        "lower-case": "^1.1.1"
+        "lower-case": "1.1.4"
       }
     },
     "node-abi": {
@@ -8707,7 +8984,7 @@
       "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.4.3.tgz",
       "integrity": "sha512-b656V5C0628gOOA2kwcpNA/bxdlqYF9FvxJ+qqVX0ctdXNVZpS8J6xEUYir3WAKc7U0BH/NRlSpNbGsy+azjeg==",
       "requires": {
-        "semver": "^5.4.1"
+        "semver": "5.5.0"
       }
     },
     "node-gyp": {
@@ -8716,18 +8993,18 @@
       "integrity": "sha512-qDQE/Ft9xXP6zphwx4sD0t+VhwV7yFaloMpfbL2QnnDZcyaiakWlLdtFGGQfTAwpFHdpbRhRxVhIHN1OKAjgbg==",
       "dev": true,
       "requires": {
-        "fstream": "^1.0.0",
-        "glob": "^7.0.3",
-        "graceful-fs": "^4.1.2",
-        "mkdirp": "^0.5.0",
-        "nopt": "2 || 3",
-        "npmlog": "0 || 1 || 2 || 3 || 4",
-        "osenv": "0",
-        "request": ">=2.9.0 <2.82.0",
-        "rimraf": "2",
-        "semver": "~5.3.0",
-        "tar": "^2.0.0",
-        "which": "1"
+        "fstream": "1.0.11",
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "mkdirp": "0.5.1",
+        "nopt": "3.0.6",
+        "npmlog": "4.1.2",
+        "osenv": "0.1.5",
+        "request": "2.81.0",
+        "rimraf": "2.6.2",
+        "semver": "5.3.0",
+        "tar": "2.2.1",
+        "which": "1.3.0"
       },
       "dependencies": {
         "ajv": {
@@ -8736,8 +9013,8 @@
           "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
           "dev": true,
           "requires": {
-            "co": "^4.6.0",
-            "json-stable-stringify": "^1.0.1"
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
           }
         },
         "assert-plus": {
@@ -8758,7 +9035,7 @@
           "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
           "dev": true,
           "requires": {
-            "hoek": "2.x.x"
+            "hoek": "2.16.3"
           }
         },
         "cryptiles": {
@@ -8767,7 +9044,7 @@
           "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
           "dev": true,
           "requires": {
-            "boom": "2.x.x"
+            "boom": "2.10.1"
           }
         },
         "form-data": {
@@ -8776,9 +9053,9 @@
           "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
           "dev": true,
           "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.5",
-            "mime-types": "^2.1.12"
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.6",
+            "mime-types": "2.1.17"
           }
         },
         "har-schema": {
@@ -8793,8 +9070,8 @@
           "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
           "dev": true,
           "requires": {
-            "ajv": "^4.9.1",
-            "har-schema": "^1.0.5"
+            "ajv": "4.11.8",
+            "har-schema": "1.0.5"
           }
         },
         "hawk": {
@@ -8803,10 +9080,10 @@
           "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
           "dev": true,
           "requires": {
-            "boom": "2.x.x",
-            "cryptiles": "2.x.x",
-            "hoek": "2.x.x",
-            "sntp": "1.x.x"
+            "boom": "2.10.1",
+            "cryptiles": "2.0.5",
+            "hoek": "2.16.3",
+            "sntp": "1.0.9"
           }
         },
         "hoek": {
@@ -8821,9 +9098,9 @@
           "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
           "dev": true,
           "requires": {
-            "assert-plus": "^0.2.0",
-            "jsprim": "^1.2.2",
-            "sshpk": "^1.7.0"
+            "assert-plus": "0.2.0",
+            "jsprim": "1.4.1",
+            "sshpk": "1.13.1"
           }
         },
         "performance-now": {
@@ -8844,28 +9121,28 @@
           "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
           "dev": true,
           "requires": {
-            "aws-sign2": "~0.6.0",
-            "aws4": "^1.2.1",
-            "caseless": "~0.12.0",
-            "combined-stream": "~1.0.5",
-            "extend": "~3.0.0",
-            "forever-agent": "~0.6.1",
-            "form-data": "~2.1.1",
-            "har-validator": "~4.2.1",
-            "hawk": "~3.1.3",
-            "http-signature": "~1.1.0",
-            "is-typedarray": "~1.0.0",
-            "isstream": "~0.1.2",
-            "json-stringify-safe": "~5.0.1",
-            "mime-types": "~2.1.7",
-            "oauth-sign": "~0.8.1",
-            "performance-now": "^0.2.0",
-            "qs": "~6.4.0",
-            "safe-buffer": "^5.0.1",
-            "stringstream": "~0.0.4",
-            "tough-cookie": "~2.3.0",
-            "tunnel-agent": "^0.6.0",
-            "uuid": "^3.0.0"
+            "aws-sign2": "0.6.0",
+            "aws4": "1.6.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.6",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.1.4",
+            "har-validator": "4.2.1",
+            "hawk": "3.1.3",
+            "http-signature": "1.1.1",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.17",
+            "oauth-sign": "0.8.2",
+            "performance-now": "0.2.0",
+            "qs": "6.4.0",
+            "safe-buffer": "5.1.1",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.3",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.2.1"
           }
         },
         "semver": {
@@ -8880,7 +9157,7 @@
           "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
           "dev": true,
           "requires": {
-            "hoek": "2.x.x"
+            "hoek": "2.16.3"
           }
         }
       }
@@ -8891,28 +9168,28 @@
       "integrity": "sha1-X5QmPUBPbkR2fXJpAf/wVHjWAN8=",
       "dev": true,
       "requires": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^1.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
+        "assert": "1.4.1",
+        "browserify-zlib": "0.2.0",
+        "buffer": "4.9.1",
+        "console-browserify": "1.1.0",
+        "constants-browserify": "1.0.0",
+        "crypto-browserify": "3.12.0",
+        "domain-browser": "1.2.0",
+        "events": "1.1.1",
+        "https-browserify": "1.0.0",
+        "os-browserify": "0.3.0",
         "path-browserify": "0.0.0",
-        "process": "^0.11.10",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.3.3",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.7.2",
-        "string_decoder": "^1.0.0",
-        "timers-browserify": "^2.0.4",
+        "process": "0.11.10",
+        "punycode": "1.4.1",
+        "querystring-es3": "0.2.1",
+        "readable-stream": "2.3.6",
+        "stream-browserify": "2.0.1",
+        "stream-http": "2.8.3",
+        "string_decoder": "1.1.1",
+        "timers-browserify": "2.0.10",
         "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.10.3",
+        "url": "0.11.0",
+        "util": "0.10.4",
         "vm-browserify": "0.0.4"
       },
       "dependencies": {
@@ -8934,13 +9211,13 @@
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -8949,7 +9226,7 @@
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         }
       }
@@ -8959,25 +9236,25 @@
       "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.10.0.tgz",
       "integrity": "sha512-fDQJfXszw6vek63Fe/ldkYXmRYK/QS6NbvM3i5oEo9ntPDy4XX7BcKZyTKv+/kSSxRtXXc7l+MSwEmYc0CSy6Q==",
       "requires": {
-        "async-foreach": "^0.1.3",
-        "chalk": "^1.1.1",
-        "cross-spawn": "^3.0.0",
-        "gaze": "^1.0.0",
-        "get-stdin": "^4.0.1",
-        "glob": "^7.0.3",
-        "in-publish": "^2.0.0",
-        "lodash.assign": "^4.2.0",
-        "lodash.clonedeep": "^4.3.2",
-        "lodash.mergewith": "^4.6.0",
-        "meow": "^3.7.0",
-        "mkdirp": "^0.5.1",
-        "nan": "^2.10.0",
-        "node-gyp": "^3.8.0",
-        "npmlog": "^4.0.0",
-        "request": "^2.88.0",
-        "sass-graph": "^2.2.4",
-        "stdout-stream": "^1.4.0",
-        "true-case-path": "^1.0.2"
+        "async-foreach": "0.1.3",
+        "chalk": "1.1.3",
+        "cross-spawn": "3.0.1",
+        "gaze": "1.1.3",
+        "get-stdin": "4.0.1",
+        "glob": "7.1.2",
+        "in-publish": "2.0.0",
+        "lodash.assign": "4.2.0",
+        "lodash.clonedeep": "4.5.0",
+        "lodash.mergewith": "4.6.1",
+        "meow": "3.7.0",
+        "mkdirp": "0.5.1",
+        "nan": "2.11.1",
+        "node-gyp": "3.8.0",
+        "npmlog": "4.1.2",
+        "request": "2.88.0",
+        "sass-graph": "2.2.4",
+        "stdout-stream": "1.4.0",
+        "true-case-path": "1.0.2"
       },
       "dependencies": {
         "ajv": {
@@ -8985,10 +9262,10 @@
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.5.tgz",
           "integrity": "sha512-7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg==",
           "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
+            "fast-deep-equal": "2.0.1",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.4.1",
+            "uri-js": "4.2.2"
           }
         },
         "aws4": {
@@ -9001,8 +9278,8 @@
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
           "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
           "requires": {
-            "lru-cache": "^4.0.1",
-            "which": "^1.2.9"
+            "lru-cache": "4.1.4",
+            "which": "1.3.0"
           }
         },
         "extend": {
@@ -9020,7 +9297,7 @@
           "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
           "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
           "requires": {
-            "globule": "^1.0.0"
+            "globule": "1.2.1"
           }
         },
         "globule": {
@@ -9028,9 +9305,9 @@
           "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
           "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
           "requires": {
-            "glob": "~7.1.1",
-            "lodash": "~4.17.10",
-            "minimatch": "~3.0.2"
+            "glob": "7.1.2",
+            "lodash": "4.17.11",
+            "minimatch": "3.0.4"
           }
         },
         "har-validator": {
@@ -9038,8 +9315,8 @@
           "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
           "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
           "requires": {
-            "ajv": "^6.5.5",
-            "har-schema": "^2.0.0"
+            "ajv": "6.5.5",
+            "har-schema": "2.0.0"
           }
         },
         "json-schema-traverse": {
@@ -9052,8 +9329,8 @@
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.4.tgz",
           "integrity": "sha512-EPstzZ23znHUVLKj+lcXO1KvZkrlw+ZirdwvOmnAnA/1PB4ggyXJ77LRkCqkff+ShQ+cqoxCxLQOh4cKITO5iA==",
           "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^3.0.2"
+            "pseudomap": "1.0.2",
+            "yallist": "3.0.3"
           }
         },
         "mime-db": {
@@ -9066,7 +9343,7 @@
           "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz",
           "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==",
           "requires": {
-            "mime-db": "~1.37.0"
+            "mime-db": "1.37.0"
           }
         },
         "nan": {
@@ -9079,18 +9356,18 @@
           "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
           "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
           "requires": {
-            "fstream": "^1.0.0",
-            "glob": "^7.0.3",
-            "graceful-fs": "^4.1.2",
-            "mkdirp": "^0.5.0",
-            "nopt": "2 || 3",
-            "npmlog": "0 || 1 || 2 || 3 || 4",
-            "osenv": "0",
-            "request": "^2.87.0",
-            "rimraf": "2",
-            "semver": "~5.3.0",
-            "tar": "^2.0.0",
-            "which": "1"
+            "fstream": "1.0.11",
+            "glob": "7.1.2",
+            "graceful-fs": "4.1.11",
+            "mkdirp": "0.5.1",
+            "nopt": "3.0.6",
+            "npmlog": "4.1.2",
+            "osenv": "0.1.5",
+            "request": "2.88.0",
+            "rimraf": "2.6.2",
+            "semver": "5.3.0",
+            "tar": "2.2.1",
+            "which": "1.3.0"
           }
         },
         "oauth-sign": {
@@ -9103,26 +9380,26 @@
           "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
           "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
           "requires": {
-            "aws-sign2": "~0.7.0",
-            "aws4": "^1.8.0",
-            "caseless": "~0.12.0",
-            "combined-stream": "~1.0.6",
-            "extend": "~3.0.2",
-            "forever-agent": "~0.6.1",
-            "form-data": "~2.3.2",
-            "har-validator": "~5.1.0",
-            "http-signature": "~1.2.0",
-            "is-typedarray": "~1.0.0",
-            "isstream": "~0.1.2",
-            "json-stringify-safe": "~5.0.1",
-            "mime-types": "~2.1.19",
-            "oauth-sign": "~0.9.0",
-            "performance-now": "^2.1.0",
-            "qs": "~6.5.2",
-            "safe-buffer": "^5.1.2",
-            "tough-cookie": "~2.4.3",
-            "tunnel-agent": "^0.6.0",
-            "uuid": "^3.3.2"
+            "aws-sign2": "0.7.0",
+            "aws4": "1.8.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.6",
+            "extend": "3.0.2",
+            "forever-agent": "0.6.1",
+            "form-data": "2.3.2",
+            "har-validator": "5.1.3",
+            "http-signature": "1.2.0",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.21",
+            "oauth-sign": "0.9.0",
+            "performance-now": "2.1.0",
+            "qs": "6.5.2",
+            "safe-buffer": "5.1.2",
+            "tough-cookie": "2.4.3",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.3.2"
           }
         },
         "safe-buffer": {
@@ -9140,8 +9417,8 @@
           "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
           "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
           "requires": {
-            "psl": "^1.1.24",
-            "punycode": "^1.4.1"
+            "psl": "1.1.29",
+            "punycode": "1.4.1"
           }
         },
         "uuid": {
@@ -9166,7 +9443,7 @@
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
       "requires": {
-        "abbrev": "1"
+        "abbrev": "1.1.1"
       }
     },
     "normalize-package-data": {
@@ -9174,10 +9451,10 @@
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
       "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=",
       "requires": {
-        "hosted-git-info": "^2.1.4",
-        "is-builtin-module": "^1.0.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
+        "hosted-git-info": "2.5.0",
+        "is-builtin-module": "1.0.0",
+        "semver": "5.5.0",
+        "validate-npm-package-license": "3.0.1"
       }
     },
     "normalize-path": {
@@ -9186,7 +9463,7 @@
       "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
       "dev": true,
       "requires": {
-        "remove-trailing-separator": "^1.0.1"
+        "remove-trailing-separator": "1.1.0"
       }
     },
     "normalize-range": {
@@ -9201,10 +9478,10 @@
       "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
       "dev": true,
       "requires": {
-        "object-assign": "^4.0.1",
-        "prepend-http": "^1.0.0",
-        "query-string": "^4.1.0",
-        "sort-keys": "^1.0.0"
+        "object-assign": "4.1.1",
+        "prepend-http": "1.0.4",
+        "query-string": "4.3.4",
+        "sort-keys": "1.1.2"
       }
     },
     "now-and-later": {
@@ -9213,7 +9490,7 @@
       "integrity": "sha1-vGHLtFbXnLMiB85HygUTb/Ln1u4=",
       "dev": true,
       "requires": {
-        "once": "^1.3.2"
+        "once": "1.4.0"
       }
     },
     "npm-run-path": {
@@ -9222,7 +9499,7 @@
       "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
       "dev": true,
       "requires": {
-        "path-key": "^2.0.0"
+        "path-key": "2.0.1"
       }
     },
     "npmlog": {
@@ -9230,10 +9507,10 @@
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
       "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
       "requires": {
-        "are-we-there-yet": "~1.1.2",
-        "console-control-strings": "~1.1.0",
-        "gauge": "~2.7.3",
-        "set-blocking": "~2.0.0"
+        "are-we-there-yet": "1.1.5",
+        "console-control-strings": "1.1.0",
+        "gauge": "2.7.4",
+        "set-blocking": "2.0.0"
       }
     },
     "nth-check": {
@@ -9242,7 +9519,7 @@
       "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
       "dev": true,
       "requires": {
-        "boolbase": "~1.0.0"
+        "boolbase": "1.0.0"
       }
     },
     "nugget": {
@@ -9251,12 +9528,12 @@
       "integrity": "sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA=",
       "dev": true,
       "requires": {
-        "debug": "^2.1.3",
-        "minimist": "^1.1.0",
-        "pretty-bytes": "^1.0.2",
-        "progress-stream": "^1.1.0",
-        "request": "^2.45.0",
-        "single-line-log": "^1.1.2",
+        "debug": "2.6.9",
+        "minimist": "1.2.0",
+        "pretty-bytes": "1.0.4",
+        "progress-stream": "1.2.0",
+        "request": "2.87.0",
+        "single-line-log": "1.1.2",
         "throttleit": "0.0.2"
       },
       "dependencies": {
@@ -9295,9 +9572,9 @@
       "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
       "dev": true,
       "requires": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
+        "copy-descriptor": "0.1.1",
+        "define-property": "0.2.5",
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "define-property": {
@@ -9306,7 +9583,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         },
         "is-accessor-descriptor": {
@@ -9315,7 +9592,7 @@
           "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           }
         },
         "is-data-descriptor": {
@@ -9324,7 +9601,7 @@
           "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           }
         },
         "is-descriptor": {
@@ -9333,9 +9610,9 @@
           "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
+            "is-accessor-descriptor": "0.1.6",
+            "is-data-descriptor": "0.1.4",
+            "kind-of": "5.1.0"
           },
           "dependencies": {
             "kind-of": {
@@ -9352,7 +9629,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -9369,7 +9646,7 @@
       "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
       "dev": true,
       "requires": {
-        "isobject": "^3.0.0"
+        "isobject": "3.0.1"
       }
     },
     "object.assign": {
@@ -9378,10 +9655,10 @@
       "integrity": "sha1-lovxEA15Vrs8oIbwBvhGs7xACNo=",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
+        "define-properties": "1.1.2",
+        "function-bind": "1.1.1",
+        "has-symbols": "1.0.0",
+        "object-keys": "1.0.12"
       },
       "dependencies": {
         "object-keys": {
@@ -9398,10 +9675,10 @@
       "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
       "dev": true,
       "requires": {
-        "array-each": "^1.0.1",
-        "array-slice": "^1.0.0",
-        "for-own": "^1.0.0",
-        "isobject": "^3.0.0"
+        "array-each": "1.0.1",
+        "array-slice": "1.1.0",
+        "for-own": "1.0.0",
+        "isobject": "3.0.1"
       }
     },
     "object.getownpropertydescriptors": {
@@ -9410,8 +9687,8 @@
       "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.5.1"
+        "define-properties": "1.1.2",
+        "es-abstract": "1.12.0"
       }
     },
     "object.map": {
@@ -9420,8 +9697,8 @@
       "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
       "dev": true,
       "requires": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
+        "for-own": "1.0.0",
+        "make-iterator": "1.0.1"
       }
     },
     "object.omit": {
@@ -9430,8 +9707,8 @@
       "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
       "dev": true,
       "requires": {
-        "for-own": "^0.1.4",
-        "is-extendable": "^0.1.1"
+        "for-own": "0.1.5",
+        "is-extendable": "0.1.1"
       },
       "dependencies": {
         "for-own": {
@@ -9440,7 +9717,7 @@
           "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
           "dev": true,
           "requires": {
-            "for-in": "^1.0.1"
+            "for-in": "1.0.2"
           }
         }
       }
@@ -9451,7 +9728,7 @@
       "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
       "dev": true,
       "requires": {
-        "isobject": "^3.0.1"
+        "isobject": "3.0.1"
       }
     },
     "object.reduce": {
@@ -9460,8 +9737,8 @@
       "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
       "dev": true,
       "requires": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
+        "for-own": "1.0.0",
+        "make-iterator": "1.0.1"
       }
     },
     "once": {
@@ -9469,7 +9746,7 @@
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "requires": {
-        "wrappy": "1"
+        "wrappy": "1.0.2"
       }
     },
     "onetime": {
@@ -9478,7 +9755,7 @@
       "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
       "dev": true,
       "requires": {
-        "mimic-fn": "^1.0.0"
+        "mimic-fn": "1.2.0"
       }
     },
     "optionator": {
@@ -9487,12 +9764,12 @@
       "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
       "dev": true,
       "requires": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.4",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "wordwrap": "~1.0.0"
+        "deep-is": "0.1.3",
+        "fast-levenshtein": "2.0.6",
+        "levn": "0.3.0",
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2",
+        "wordwrap": "1.0.0"
       }
     },
     "ora": {
@@ -9501,10 +9778,10 @@
       "integrity": "sha1-iERYIVs6XUCXWSKF+TMhu3p54uU=",
       "dev": true,
       "requires": {
-        "chalk": "^2.1.0",
-        "cli-cursor": "^2.1.0",
-        "cli-spinners": "^1.0.1",
-        "log-symbols": "^2.1.0"
+        "chalk": "2.4.1",
+        "cli-cursor": "2.1.0",
+        "cli-spinners": "1.3.1",
+        "log-symbols": "2.2.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -9513,7 +9790,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "^1.9.0"
+            "color-convert": "1.9.2"
           }
         },
         "chalk": {
@@ -9522,9 +9799,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
           }
         },
         "has-flag": {
@@ -9539,7 +9816,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -9550,9 +9827,9 @@
       "integrity": "sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=",
       "dev": true,
       "requires": {
-        "end-of-stream": "~0.1.5",
-        "sequencify": "~0.0.7",
-        "stream-consume": "~0.1.0"
+        "end-of-stream": "0.1.5",
+        "sequencify": "0.0.7",
+        "stream-consume": "0.1.1"
       },
       "dependencies": {
         "end-of-stream": {
@@ -9561,7 +9838,7 @@
           "integrity": "sha1-jhdyBsPICDfYVjLouTWd/osvbq8=",
           "dev": true,
           "requires": {
-            "once": "~1.3.0"
+            "once": "1.3.3"
           }
         },
         "once": {
@@ -9570,7 +9847,7 @@
           "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
           "dev": true,
           "requires": {
-            "wrappy": "1"
+            "wrappy": "1.0.2"
           }
         }
       }
@@ -9581,7 +9858,7 @@
       "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
       "dev": true,
       "requires": {
-        "readable-stream": "^2.0.1"
+        "readable-stream": "2.3.6"
       },
       "dependencies": {
         "isarray": {
@@ -9602,13 +9879,13 @@
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -9617,7 +9894,7 @@
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         }
       }
@@ -9638,7 +9915,7 @@
       "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
       "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
       "requires": {
-        "lcid": "^1.0.0"
+        "lcid": "1.0.0"
       }
     },
     "os-tmpdir": {
@@ -9651,8 +9928,8 @@
       "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
       "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
       "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
+        "os-homedir": "1.0.2",
+        "os-tmpdir": "1.0.2"
       }
     },
     "p-finally": {
@@ -9667,7 +9944,7 @@
       "integrity": "sha1-uGvV8MJWkJEcdZD8v8IBDVSzzLg=",
       "dev": true,
       "requires": {
-        "p-try": "^1.0.0"
+        "p-try": "1.0.0"
       }
     },
     "p-locate": {
@@ -9676,7 +9953,7 @@
       "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
       "dev": true,
       "requires": {
-        "p-limit": "^1.1.0"
+        "p-limit": "1.3.0"
       }
     },
     "p-map": {
@@ -9703,9 +9980,9 @@
       "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
       "dev": true,
       "requires": {
-        "cyclist": "~0.2.2",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.1.5"
+        "cyclist": "0.2.2",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6"
       },
       "dependencies": {
         "isarray": {
@@ -9726,13 +10003,13 @@
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -9741,7 +10018,7 @@
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         }
       }
@@ -9752,7 +10029,7 @@
       "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
       "dev": true,
       "requires": {
-        "no-case": "^2.2.0"
+        "no-case": "2.3.2"
       }
     },
     "parse-asn1": {
@@ -9761,11 +10038,11 @@
       "integrity": "sha1-9r8pOBgzK9DatU77Fgh3JHRebKg=",
       "dev": true,
       "requires": {
-        "asn1.js": "^4.0.0",
-        "browserify-aes": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3"
+        "asn1.js": "4.10.1",
+        "browserify-aes": "1.2.0",
+        "create-hash": "1.2.0",
+        "evp_bytestokey": "1.0.3",
+        "pbkdf2": "3.0.16"
       }
     },
     "parse-filepath": {
@@ -9774,9 +10051,9 @@
       "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
       "dev": true,
       "requires": {
-        "is-absolute": "^1.0.0",
-        "map-cache": "^0.2.0",
-        "path-root": "^0.1.1"
+        "is-absolute": "1.0.0",
+        "map-cache": "0.2.2",
+        "path-root": "0.1.1"
       }
     },
     "parse-glob": {
@@ -9785,10 +10062,10 @@
       "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
       "dev": true,
       "requires": {
-        "glob-base": "^0.3.0",
-        "is-dotfile": "^1.0.0",
-        "is-extglob": "^1.0.0",
-        "is-glob": "^2.0.0"
+        "glob-base": "0.3.0",
+        "is-dotfile": "1.0.3",
+        "is-extglob": "1.0.0",
+        "is-glob": "2.0.1"
       },
       "dependencies": {
         "is-extglob": {
@@ -9803,7 +10080,7 @@
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
           "requires": {
-            "is-extglob": "^1.0.0"
+            "is-extglob": "1.0.0"
           }
         }
       }
@@ -9813,7 +10090,7 @@
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
       "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
       "requires": {
-        "error-ex": "^1.2.0"
+        "error-ex": "1.3.1"
       }
     },
     "parse-passwd": {
@@ -9875,7 +10152,7 @@
       "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
       "dev": true,
       "requires": {
-        "path-root-regex": "^0.1.0"
+        "path-root-regex": "0.1.2"
       }
     },
     "path-root-regex": {
@@ -9889,9 +10166,9 @@
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
       "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
+        "graceful-fs": "4.1.11",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1"
       },
       "dependencies": {
         "pify": {
@@ -9907,7 +10184,7 @@
       "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
       "dev": true,
       "requires": {
-        "through": "~2.3"
+        "through": "2.3.8"
       }
     },
     "pbkdf2": {
@@ -9916,11 +10193,11 @@
       "integrity": "sha1-dAQgjsawG2LYW/g4U6gGT42cKlw=",
       "dev": true,
       "requires": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
+        "create-hash": "1.2.0",
+        "create-hmac": "1.1.7",
+        "ripemd160": "2.0.2",
+        "safe-buffer": "5.1.1",
+        "sha.js": "2.4.11"
       }
     },
     "pend": {
@@ -9950,7 +10227,7 @@
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
       "requires": {
-        "pinkie": "^2.0.0"
+        "pinkie": "2.0.4"
       }
     },
     "pkg-dir": {
@@ -9959,7 +10236,7 @@
       "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
       "dev": true,
       "requires": {
-        "find-up": "^2.1.0"
+        "find-up": "2.1.0"
       }
     },
     "plugin-error": {
@@ -9968,11 +10245,11 @@
       "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
       "dev": true,
       "requires": {
-        "ansi-cyan": "^0.1.1",
-        "ansi-red": "^0.1.1",
-        "arr-diff": "^1.0.1",
-        "arr-union": "^2.0.1",
-        "extend-shallow": "^1.1.2"
+        "ansi-cyan": "0.1.1",
+        "ansi-red": "0.1.1",
+        "arr-diff": "1.1.0",
+        "arr-union": "2.1.0",
+        "extend-shallow": "1.1.4"
       },
       "dependencies": {
         "arr-diff": {
@@ -9981,8 +10258,8 @@
           "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
           "dev": true,
           "requires": {
-            "arr-flatten": "^1.0.1",
-            "array-slice": "^0.2.3"
+            "arr-flatten": "1.1.0",
+            "array-slice": "0.2.3"
           }
         },
         "arr-union": {
@@ -10003,7 +10280,7 @@
           "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
           "dev": true,
           "requires": {
-            "kind-of": "^1.1.0"
+            "kind-of": "1.1.0"
           }
         },
         "kind-of": {
@@ -10038,10 +10315,10 @@
       "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
       "dev": true,
       "requires": {
-        "chalk": "^1.1.3",
-        "js-base64": "^2.1.9",
-        "source-map": "^0.5.6",
-        "supports-color": "^3.2.3"
+        "chalk": "1.1.3",
+        "js-base64": "2.4.5",
+        "source-map": "0.5.7",
+        "supports-color": "3.2.3"
       },
       "dependencies": {
         "supports-color": {
@@ -10050,7 +10327,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "^1.0.0"
+            "has-flag": "1.0.0"
           }
         }
       }
@@ -10061,9 +10338,9 @@
       "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=",
       "dev": true,
       "requires": {
-        "postcss": "^5.0.2",
-        "postcss-message-helpers": "^2.0.0",
-        "reduce-css-calc": "^1.2.6"
+        "postcss": "5.2.18",
+        "postcss-message-helpers": "2.0.0",
+        "reduce-css-calc": "1.3.0"
       }
     },
     "postcss-colormin": {
@@ -10072,9 +10349,9 @@
       "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=",
       "dev": true,
       "requires": {
-        "colormin": "^1.0.5",
-        "postcss": "^5.0.13",
-        "postcss-value-parser": "^3.2.3"
+        "colormin": "1.1.2",
+        "postcss": "5.2.18",
+        "postcss-value-parser": "3.3.0"
       }
     },
     "postcss-convert-values": {
@@ -10083,8 +10360,8 @@
       "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=",
       "dev": true,
       "requires": {
-        "postcss": "^5.0.11",
-        "postcss-value-parser": "^3.1.2"
+        "postcss": "5.2.18",
+        "postcss-value-parser": "3.3.0"
       }
     },
     "postcss-discard-comments": {
@@ -10093,7 +10370,7 @@
       "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=",
       "dev": true,
       "requires": {
-        "postcss": "^5.0.14"
+        "postcss": "5.2.18"
       }
     },
     "postcss-discard-duplicates": {
@@ -10102,7 +10379,7 @@
       "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=",
       "dev": true,
       "requires": {
-        "postcss": "^5.0.4"
+        "postcss": "5.2.18"
       }
     },
     "postcss-discard-empty": {
@@ -10111,7 +10388,7 @@
       "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=",
       "dev": true,
       "requires": {
-        "postcss": "^5.0.14"
+        "postcss": "5.2.18"
       }
     },
     "postcss-discard-overridden": {
@@ -10120,7 +10397,7 @@
       "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=",
       "dev": true,
       "requires": {
-        "postcss": "^5.0.16"
+        "postcss": "5.2.18"
       }
     },
     "postcss-discard-unused": {
@@ -10129,8 +10406,8 @@
       "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=",
       "dev": true,
       "requires": {
-        "postcss": "^5.0.14",
-        "uniqs": "^2.0.0"
+        "postcss": "5.2.18",
+        "uniqs": "2.0.0"
       }
     },
     "postcss-filter-plugins": {
@@ -10139,7 +10416,7 @@
       "integrity": "sha1-giRf34IzcEFkXkdxFNjlk6oYuOw=",
       "dev": true,
       "requires": {
-        "postcss": "^5.0.4"
+        "postcss": "5.2.18"
       }
     },
     "postcss-load-config": {
@@ -10148,10 +10425,10 @@
       "integrity": "sha1-U56a/J3chiASHr+djDZz4M5Q0oo=",
       "dev": true,
       "requires": {
-        "cosmiconfig": "^2.1.0",
-        "object-assign": "^4.1.0",
-        "postcss-load-options": "^1.2.0",
-        "postcss-load-plugins": "^2.3.0"
+        "cosmiconfig": "2.2.2",
+        "object-assign": "4.1.1",
+        "postcss-load-options": "1.2.0",
+        "postcss-load-plugins": "2.3.0"
       }
     },
     "postcss-load-options": {
@@ -10160,8 +10437,8 @@
       "integrity": "sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=",
       "dev": true,
       "requires": {
-        "cosmiconfig": "^2.1.0",
-        "object-assign": "^4.1.0"
+        "cosmiconfig": "2.2.2",
+        "object-assign": "4.1.1"
       }
     },
     "postcss-load-plugins": {
@@ -10170,8 +10447,8 @@
       "integrity": "sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=",
       "dev": true,
       "requires": {
-        "cosmiconfig": "^2.1.1",
-        "object-assign": "^4.1.0"
+        "cosmiconfig": "2.2.2",
+        "object-assign": "4.1.1"
       }
     },
     "postcss-merge-idents": {
@@ -10180,9 +10457,9 @@
       "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=",
       "dev": true,
       "requires": {
-        "has": "^1.0.1",
-        "postcss": "^5.0.10",
-        "postcss-value-parser": "^3.1.1"
+        "has": "1.0.3",
+        "postcss": "5.2.18",
+        "postcss-value-parser": "3.3.0"
       }
     },
     "postcss-merge-longhand": {
@@ -10191,7 +10468,7 @@
       "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=",
       "dev": true,
       "requires": {
-        "postcss": "^5.0.4"
+        "postcss": "5.2.18"
       }
     },
     "postcss-merge-rules": {
@@ -10200,11 +10477,11 @@
       "integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=",
       "dev": true,
       "requires": {
-        "browserslist": "^1.5.2",
-        "caniuse-api": "^1.5.2",
-        "postcss": "^5.0.4",
-        "postcss-selector-parser": "^2.2.2",
-        "vendors": "^1.0.0"
+        "browserslist": "1.7.7",
+        "caniuse-api": "1.6.1",
+        "postcss": "5.2.18",
+        "postcss-selector-parser": "2.2.3",
+        "vendors": "1.0.2"
       },
       "dependencies": {
         "browserslist": {
@@ -10213,8 +10490,8 @@
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
           "dev": true,
           "requires": {
-            "caniuse-db": "^1.0.30000639",
-            "electron-to-chromium": "^1.2.7"
+            "caniuse-db": "1.0.30000862",
+            "electron-to-chromium": "1.3.51"
           }
         }
       }
@@ -10231,9 +10508,9 @@
       "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=",
       "dev": true,
       "requires": {
-        "object-assign": "^4.0.1",
-        "postcss": "^5.0.4",
-        "postcss-value-parser": "^3.0.2"
+        "object-assign": "4.1.1",
+        "postcss": "5.2.18",
+        "postcss-value-parser": "3.3.0"
       }
     },
     "postcss-minify-gradients": {
@@ -10242,8 +10519,8 @@
       "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=",
       "dev": true,
       "requires": {
-        "postcss": "^5.0.12",
-        "postcss-value-parser": "^3.3.0"
+        "postcss": "5.2.18",
+        "postcss-value-parser": "3.3.0"
       }
     },
     "postcss-minify-params": {
@@ -10252,10 +10529,10 @@
       "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=",
       "dev": true,
       "requires": {
-        "alphanum-sort": "^1.0.1",
-        "postcss": "^5.0.2",
-        "postcss-value-parser": "^3.0.2",
-        "uniqs": "^2.0.0"
+        "alphanum-sort": "1.0.2",
+        "postcss": "5.2.18",
+        "postcss-value-parser": "3.3.0",
+        "uniqs": "2.0.0"
       }
     },
     "postcss-minify-selectors": {
@@ -10264,10 +10541,10 @@
       "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=",
       "dev": true,
       "requires": {
-        "alphanum-sort": "^1.0.2",
-        "has": "^1.0.1",
-        "postcss": "^5.0.14",
-        "postcss-selector-parser": "^2.0.0"
+        "alphanum-sort": "1.0.2",
+        "has": "1.0.3",
+        "postcss": "5.2.18",
+        "postcss-selector-parser": "2.2.3"
       }
     },
     "postcss-modules-extract-imports": {
@@ -10276,7 +10553,7 @@
       "integrity": "sha1-ZhQOzs447wa/DT41XWm/WdFB6oU=",
       "dev": true,
       "requires": {
-        "postcss": "^6.0.1"
+        "postcss": "6.0.23"
       },
       "dependencies": {
         "ansi-styles": {
@@ -10285,7 +10562,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "^1.9.0"
+            "color-convert": "1.9.2"
           }
         },
         "chalk": {
@@ -10294,9 +10571,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
           }
         },
         "has-flag": {
@@ -10311,9 +10588,9 @@
           "integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
+            "chalk": "2.4.1",
+            "source-map": "0.6.1",
+            "supports-color": "5.4.0"
           }
         },
         "source-map": {
@@ -10328,7 +10605,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -10339,8 +10616,8 @@
       "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=",
       "dev": true,
       "requires": {
-        "css-selector-tokenizer": "^0.7.0",
-        "postcss": "^6.0.1"
+        "css-selector-tokenizer": "0.7.0",
+        "postcss": "6.0.23"
       },
       "dependencies": {
         "ansi-styles": {
@@ -10349,7 +10626,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "^1.9.0"
+            "color-convert": "1.9.2"
           }
         },
         "chalk": {
@@ -10358,9 +10635,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
           }
         },
         "has-flag": {
@@ -10375,9 +10652,9 @@
           "integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
+            "chalk": "2.4.1",
+            "source-map": "0.6.1",
+            "supports-color": "5.4.0"
           }
         },
         "source-map": {
@@ -10392,7 +10669,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -10403,8 +10680,8 @@
       "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=",
       "dev": true,
       "requires": {
-        "css-selector-tokenizer": "^0.7.0",
-        "postcss": "^6.0.1"
+        "css-selector-tokenizer": "0.7.0",
+        "postcss": "6.0.23"
       },
       "dependencies": {
         "ansi-styles": {
@@ -10413,7 +10690,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "^1.9.0"
+            "color-convert": "1.9.2"
           }
         },
         "chalk": {
@@ -10422,9 +10699,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
           }
         },
         "has-flag": {
@@ -10439,9 +10716,9 @@
           "integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
+            "chalk": "2.4.1",
+            "source-map": "0.6.1",
+            "supports-color": "5.4.0"
           }
         },
         "source-map": {
@@ -10456,7 +10733,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -10467,8 +10744,8 @@
       "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=",
       "dev": true,
       "requires": {
-        "icss-replace-symbols": "^1.1.0",
-        "postcss": "^6.0.1"
+        "icss-replace-symbols": "1.1.0",
+        "postcss": "6.0.23"
       },
       "dependencies": {
         "ansi-styles": {
@@ -10477,7 +10754,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "^1.9.0"
+            "color-convert": "1.9.2"
           }
         },
         "chalk": {
@@ -10486,9 +10763,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
           }
         },
         "has-flag": {
@@ -10503,9 +10780,9 @@
           "integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
+            "chalk": "2.4.1",
+            "source-map": "0.6.1",
+            "supports-color": "5.4.0"
           }
         },
         "source-map": {
@@ -10520,7 +10797,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -10531,7 +10808,7 @@
       "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=",
       "dev": true,
       "requires": {
-        "postcss": "^5.0.5"
+        "postcss": "5.2.18"
       }
     },
     "postcss-normalize-url": {
@@ -10540,10 +10817,10 @@
       "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=",
       "dev": true,
       "requires": {
-        "is-absolute-url": "^2.0.0",
-        "normalize-url": "^1.4.0",
-        "postcss": "^5.0.14",
-        "postcss-value-parser": "^3.2.3"
+        "is-absolute-url": "2.1.0",
+        "normalize-url": "1.9.1",
+        "postcss": "5.2.18",
+        "postcss-value-parser": "3.3.0"
       }
     },
     "postcss-ordered-values": {
@@ -10552,8 +10829,8 @@
       "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=",
       "dev": true,
       "requires": {
-        "postcss": "^5.0.4",
-        "postcss-value-parser": "^3.0.1"
+        "postcss": "5.2.18",
+        "postcss-value-parser": "3.3.0"
       }
     },
     "postcss-reduce-idents": {
@@ -10562,8 +10839,8 @@
       "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=",
       "dev": true,
       "requires": {
-        "postcss": "^5.0.4",
-        "postcss-value-parser": "^3.0.2"
+        "postcss": "5.2.18",
+        "postcss-value-parser": "3.3.0"
       }
     },
     "postcss-reduce-initial": {
@@ -10572,7 +10849,7 @@
       "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=",
       "dev": true,
       "requires": {
-        "postcss": "^5.0.4"
+        "postcss": "5.2.18"
       }
     },
     "postcss-reduce-transforms": {
@@ -10581,9 +10858,9 @@
       "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=",
       "dev": true,
       "requires": {
-        "has": "^1.0.1",
-        "postcss": "^5.0.8",
-        "postcss-value-parser": "^3.0.1"
+        "has": "1.0.3",
+        "postcss": "5.2.18",
+        "postcss-value-parser": "3.3.0"
       }
     },
     "postcss-selector-parser": {
@@ -10592,9 +10869,9 @@
       "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
       "dev": true,
       "requires": {
-        "flatten": "^1.0.2",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
+        "flatten": "1.0.2",
+        "indexes-of": "1.0.1",
+        "uniq": "1.0.1"
       }
     },
     "postcss-svgo": {
@@ -10603,10 +10880,10 @@
       "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=",
       "dev": true,
       "requires": {
-        "is-svg": "^2.0.0",
-        "postcss": "^5.0.14",
-        "postcss-value-parser": "^3.2.3",
-        "svgo": "^0.7.0"
+        "is-svg": "2.1.0",
+        "postcss": "5.2.18",
+        "postcss-value-parser": "3.3.0",
+        "svgo": "0.7.2"
       }
     },
     "postcss-unique-selectors": {
@@ -10615,9 +10892,9 @@
       "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=",
       "dev": true,
       "requires": {
-        "alphanum-sort": "^1.0.1",
-        "postcss": "^5.0.4",
-        "uniqs": "^2.0.0"
+        "alphanum-sort": "1.0.2",
+        "postcss": "5.2.18",
+        "uniqs": "2.0.0"
       }
     },
     "postcss-value-parser": {
@@ -10632,9 +10909,9 @@
       "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=",
       "dev": true,
       "requires": {
-        "has": "^1.0.1",
-        "postcss": "^5.0.4",
-        "uniqs": "^2.0.0"
+        "has": "1.0.3",
+        "postcss": "5.2.18",
+        "uniqs": "2.0.0"
       }
     },
     "prebuild-install": {
@@ -10642,22 +10919,22 @@
       "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.2.1.tgz",
       "integrity": "sha512-9DAccsInWHB48TBQi2eJkLPE049JuAI6FjIH0oIrij4bpDVEbX6JvlWRAcAAlUqBHhjgq0jNqA3m3bBXWm9v6w==",
       "requires": {
-        "detect-libc": "^1.0.3",
-        "expand-template": "^1.0.2",
+        "detect-libc": "1.0.3",
+        "expand-template": "1.1.1",
         "github-from-package": "0.0.0",
-        "minimist": "^1.2.0",
-        "mkdirp": "^0.5.1",
-        "napi-build-utils": "^1.0.1",
-        "node-abi": "^2.2.0",
-        "noop-logger": "^0.1.1",
-        "npmlog": "^4.0.1",
-        "os-homedir": "^1.0.1",
-        "pump": "^2.0.1",
-        "rc": "^1.2.7",
-        "simple-get": "^2.7.0",
-        "tar-fs": "^1.13.0",
-        "tunnel-agent": "^0.6.0",
-        "which-pm-runs": "^1.0.0"
+        "minimist": "1.2.0",
+        "mkdirp": "0.5.1",
+        "napi-build-utils": "1.0.1",
+        "node-abi": "2.4.3",
+        "noop-logger": "0.1.1",
+        "npmlog": "4.1.2",
+        "os-homedir": "1.0.2",
+        "pump": "2.0.1",
+        "rc": "1.2.8",
+        "simple-get": "2.8.1",
+        "tar-fs": "1.16.3",
+        "tunnel-agent": "0.6.0",
+        "which-pm-runs": "1.0.0"
       },
       "dependencies": {
         "deep-extend": {
@@ -10675,8 +10952,8 @@
           "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
           "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
           "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
+            "end-of-stream": "1.4.1",
+            "once": "1.4.0"
           }
         },
         "rc": {
@@ -10684,10 +10961,10 @@
           "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
           "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
           "requires": {
-            "deep-extend": "^0.6.0",
-            "ini": "~1.3.0",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
+            "deep-extend": "0.6.0",
+            "ini": "1.3.5",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
           }
         }
       }
@@ -10722,8 +10999,8 @@
       "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=",
       "dev": true,
       "requires": {
-        "get-stdin": "^4.0.1",
-        "meow": "^3.1.0"
+        "get-stdin": "4.0.1",
+        "meow": "3.7.0"
       }
     },
     "pretty-error": {
@@ -10732,8 +11009,8 @@
       "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
       "dev": true,
       "requires": {
-        "renderkid": "^2.0.1",
-        "utila": "~0.4"
+        "renderkid": "2.0.1",
+        "utila": "0.4.0"
       }
     },
     "pretty-hrtime": {
@@ -10772,8 +11049,8 @@
       "integrity": "sha1-LNPP6jO6OonJwSHsM0er6asSX3c=",
       "dev": true,
       "requires": {
-        "speedometer": "~0.1.2",
-        "through2": "~0.2.3"
+        "speedometer": "0.1.4",
+        "through2": "0.2.3"
       }
     },
     "promise-inflight": {
@@ -10810,11 +11087,11 @@
       "integrity": "sha1-RuuRByBr9zSJ+LhbadkTNMZhCZQ=",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1"
+        "bn.js": "4.11.8",
+        "browserify-rsa": "4.0.1",
+        "create-hash": "1.2.0",
+        "parse-asn1": "5.1.1",
+        "randombytes": "2.0.6"
       }
     },
     "pump": {
@@ -10823,8 +11100,8 @@
       "integrity": "sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ=",
       "dev": true,
       "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
+        "end-of-stream": "1.4.1",
+        "once": "1.4.0"
       },
       "dependencies": {
         "end-of-stream": {
@@ -10833,7 +11110,7 @@
           "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
           "dev": true,
           "requires": {
-            "once": "^1.4.0"
+            "once": "1.4.0"
           }
         }
       }
@@ -10844,9 +11121,9 @@
       "integrity": "sha512-2kmNR9ry+Pf45opRVirpNuIFotsxUGLaYqxIwuR77AYrYRMuFCz9eryHBS52L360O+NcR383CL4QYlMKPq4zYA==",
       "dev": true,
       "requires": {
-        "duplexify": "^3.5.3",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
+        "duplexify": "3.5.4",
+        "inherits": "2.0.3",
+        "pump": "2.0.1"
       },
       "dependencies": {
         "end-of-stream": {
@@ -10855,7 +11132,7 @@
           "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
           "dev": true,
           "requires": {
-            "once": "^1.4.0"
+            "once": "1.4.0"
           }
         },
         "pump": {
@@ -10864,8 +11141,8 @@
           "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
           "dev": true,
           "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
+            "end-of-stream": "1.4.1",
+            "once": "1.4.0"
           }
         }
       }
@@ -10891,8 +11168,8 @@
       "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
       "dev": true,
       "requires": {
-        "object-assign": "^4.1.0",
-        "strict-uri-encode": "^1.0.0"
+        "object-assign": "4.1.1",
+        "strict-uri-encode": "1.1.0"
       }
     },
     "querystring": {
@@ -10913,9 +11190,9 @@
       "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==",
       "dev": true,
       "requires": {
-        "is-number": "^4.0.0",
-        "kind-of": "^6.0.0",
-        "math-random": "^1.0.1"
+        "is-number": "4.0.0",
+        "kind-of": "6.0.2",
+        "math-random": "1.0.1"
       },
       "dependencies": {
         "is-number": {
@@ -10932,7 +11209,7 @@
       "integrity": "sha1-0wLFIpSFiISKjTAMkytEwkIx2oA=",
       "dev": true,
       "requires": {
-        "safe-buffer": "^5.1.0"
+        "safe-buffer": "5.1.1"
       }
     },
     "randomfill": {
@@ -10941,8 +11218,8 @@
       "integrity": "sha1-ySGW/IarQr6YPxvzF3giSTHWFFg=",
       "dev": true,
       "requires": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
+        "randombytes": "2.0.6",
+        "safe-buffer": "5.1.1"
       }
     },
     "rc": {
@@ -10951,10 +11228,10 @@
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
       "dev": true,
       "requires": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
+        "deep-extend": "0.6.0",
+        "ini": "1.3.5",
+        "minimist": "1.2.0",
+        "strip-json-comments": "2.0.1"
       },
       "dependencies": {
         "minimist": {
@@ -10970,9 +11247,9 @@
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
       "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
       "requires": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
+        "load-json-file": "1.1.0",
+        "normalize-package-data": "2.4.0",
+        "path-type": "1.1.0"
       }
     },
     "read-pkg-up": {
@@ -10980,8 +11257,8 @@
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
       "requires": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
+        "find-up": "1.1.2",
+        "read-pkg": "1.1.0"
       },
       "dependencies": {
         "find-up": {
@@ -10989,8 +11266,8 @@
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
           "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
           "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "path-exists": "2.1.0",
+            "pinkie-promise": "2.0.1"
           }
         },
         "path-exists": {
@@ -10998,7 +11275,7 @@
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
           "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
           "requires": {
-            "pinkie-promise": "^2.0.0"
+            "pinkie-promise": "2.0.1"
           }
         }
       }
@@ -11008,10 +11285,10 @@
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
       "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
       "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
+        "core-util-is": "1.0.2",
+        "inherits": "2.0.3",
         "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
+        "string_decoder": "0.10.31"
       }
     },
     "readdirp": {
@@ -11020,10 +11297,10 @@
       "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "minimatch": "^3.0.2",
-        "readable-stream": "^2.0.2",
-        "set-immediate-shim": "^1.0.1"
+        "graceful-fs": "4.1.11",
+        "minimatch": "3.0.4",
+        "readable-stream": "2.3.3",
+        "set-immediate-shim": "1.0.1"
       },
       "dependencies": {
         "isarray": {
@@ -11038,13 +11315,13 @@
           "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~1.0.6",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.0.3",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.0.3",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -11053,7 +11330,7 @@
           "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         }
       }
@@ -11064,8 +11341,8 @@
       "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
       "dev": true,
       "requires": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
+        "code-point-at": "1.1.0",
+        "is-fullwidth-code-point": "1.0.0",
         "mute-stream": "0.0.5"
       },
       "dependencies": {
@@ -11083,7 +11360,7 @@
       "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
       "dev": true,
       "requires": {
-        "resolve": "^1.1.6"
+        "resolve": "1.5.0"
       }
     },
     "redent": {
@@ -11091,8 +11368,8 @@
       "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
       "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
       "requires": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
+        "indent-string": "2.1.0",
+        "strip-indent": "1.0.1"
       }
     },
     "reduce-css-calc": {
@@ -11101,9 +11378,9 @@
       "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
       "dev": true,
       "requires": {
-        "balanced-match": "^0.4.2",
-        "math-expression-evaluator": "^1.2.14",
-        "reduce-function-call": "^1.0.1"
+        "balanced-match": "0.4.2",
+        "math-expression-evaluator": "1.2.17",
+        "reduce-function-call": "1.0.2"
       },
       "dependencies": {
         "balanced-match": {
@@ -11120,7 +11397,7 @@
       "integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=",
       "dev": true,
       "requires": {
-        "balanced-match": "^0.4.2"
+        "balanced-match": "0.4.2"
       },
       "dependencies": {
         "balanced-match": {
@@ -11149,9 +11426,9 @@
       "integrity": "sha1-HkmWg3Ix2ot/PPQRTXG1aRoGgN0=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.18.0",
-        "babel-types": "^6.19.0",
-        "private": "^0.1.6"
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "private": "0.1.8"
       }
     },
     "regex-cache": {
@@ -11160,7 +11437,7 @@
       "integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=",
       "dev": true,
       "requires": {
-        "is-equal-shallow": "^0.1.3"
+        "is-equal-shallow": "0.1.3"
       }
     },
     "regex-not": {
@@ -11169,7 +11446,7 @@
       "integrity": "sha1-Qvg+OXcWIt+CawKvF2Ul1qXxV/k=",
       "dev": true,
       "requires": {
-        "extend-shallow": "^2.0.1"
+        "extend-shallow": "2.0.1"
       }
     },
     "regexpp": {
@@ -11184,9 +11461,9 @@
       "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
       "dev": true,
       "requires": {
-        "regenerate": "^1.2.1",
-        "regjsgen": "^0.2.0",
-        "regjsparser": "^0.1.4"
+        "regenerate": "1.3.3",
+        "regjsgen": "0.2.0",
+        "regjsparser": "0.1.5"
       }
     },
     "regjsgen": {
@@ -11201,7 +11478,7 @@
       "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
       "dev": true,
       "requires": {
-        "jsesc": "~0.5.0"
+        "jsesc": "0.5.0"
       },
       "dependencies": {
         "jsesc": {
@@ -11224,8 +11501,8 @@
       "integrity": "sha1-wr8eN3Ug0yT2I4kuM8EMrCwlK1M=",
       "dev": true,
       "requires": {
-        "is-buffer": "^1.1.5",
-        "is-utf8": "^0.2.1"
+        "is-buffer": "1.1.6",
+        "is-utf8": "0.2.1"
       }
     },
     "remove-bom-stream": {
@@ -11234,9 +11511,9 @@
       "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
       "dev": true,
       "requires": {
-        "remove-bom-buffer": "^3.0.0",
-        "safe-buffer": "^5.1.0",
-        "through2": "^2.0.3"
+        "remove-bom-buffer": "3.0.0",
+        "safe-buffer": "5.1.1",
+        "through2": "2.0.3"
       },
       "dependencies": {
         "isarray": {
@@ -11257,13 +11534,13 @@
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -11272,7 +11549,7 @@
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         },
         "through2": {
@@ -11281,8 +11558,8 @@
           "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
           "dev": true,
           "requires": {
-            "readable-stream": "^2.1.5",
-            "xtend": "~4.0.1"
+            "readable-stream": "2.3.6",
+            "xtend": "4.0.1"
           }
         },
         "xtend": {
@@ -11305,11 +11582,11 @@
       "integrity": "sha1-iYyr/Ivt5Le5ETWj/9Mj5YwNsxk=",
       "dev": true,
       "requires": {
-        "css-select": "^1.1.0",
-        "dom-converter": "~0.1",
-        "htmlparser2": "~3.3.0",
-        "strip-ansi": "^3.0.0",
-        "utila": "~0.3"
+        "css-select": "1.2.0",
+        "dom-converter": "0.1.4",
+        "htmlparser2": "3.3.0",
+        "strip-ansi": "3.0.1",
+        "utila": "0.3.3"
       },
       "dependencies": {
         "utila": {
@@ -11337,7 +11614,7 @@
       "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
       "requires": {
-        "is-finite": "^1.0.0"
+        "is-finite": "1.0.2"
       }
     },
     "replace-ext": {
@@ -11352,9 +11629,9 @@
       "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
       "dev": true,
       "requires": {
-        "homedir-polyfill": "^1.0.1",
-        "is-absolute": "^1.0.0",
-        "remove-trailing-separator": "^1.1.0"
+        "homedir-polyfill": "1.0.1",
+        "is-absolute": "1.0.0",
+        "remove-trailing-separator": "1.1.0"
       }
     },
     "request": {
@@ -11362,26 +11639,26 @@
       "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
       "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
       "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.6.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.5",
-        "extend": "~3.0.1",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.1",
-        "har-validator": "~5.0.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.17",
-        "oauth-sign": "~0.8.2",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.1",
-        "safe-buffer": "^5.1.1",
-        "tough-cookie": "~2.3.3",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.1.0"
+        "aws-sign2": "0.7.0",
+        "aws4": "1.6.0",
+        "caseless": "0.12.0",
+        "combined-stream": "1.0.6",
+        "extend": "3.0.1",
+        "forever-agent": "0.6.1",
+        "form-data": "2.3.2",
+        "har-validator": "5.0.3",
+        "http-signature": "1.2.0",
+        "is-typedarray": "1.0.0",
+        "isstream": "0.1.2",
+        "json-stringify-safe": "5.0.1",
+        "mime-types": "2.1.17",
+        "oauth-sign": "0.8.2",
+        "performance-now": "2.1.0",
+        "qs": "6.5.2",
+        "safe-buffer": "5.1.1",
+        "tough-cookie": "2.3.3",
+        "tunnel-agent": "0.6.0",
+        "uuid": "3.2.1"
       }
     },
     "request-promise-core": {
@@ -11390,7 +11667,7 @@
       "integrity": "sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=",
       "dev": true,
       "requires": {
-        "lodash": "^4.13.1"
+        "lodash": "4.17.11"
       }
     },
     "request-promise-native": {
@@ -11400,8 +11677,8 @@
       "dev": true,
       "requires": {
         "request-promise-core": "1.1.1",
-        "stealthy-require": "^1.1.0",
-        "tough-cookie": ">=2.3.3"
+        "stealthy-require": "1.1.1",
+        "tough-cookie": "2.3.3"
       }
     },
     "require-directory": {
@@ -11426,8 +11703,8 @@
       "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
       "dev": true,
       "requires": {
-        "caller-path": "^0.1.0",
-        "resolve-from": "^1.0.0"
+        "caller-path": "0.1.0",
+        "resolve-from": "1.0.1"
       }
     },
     "resolve": {
@@ -11436,7 +11713,7 @@
       "integrity": "sha1-HwmsznlsmnYlefMbLBzEw83fnzY=",
       "dev": true,
       "requires": {
-        "path-parse": "^1.0.5"
+        "path-parse": "1.0.5"
       }
     },
     "resolve-dir": {
@@ -11445,8 +11722,8 @@
       "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
       "dev": true,
       "requires": {
-        "expand-tilde": "^2.0.0",
-        "global-modules": "^1.0.0"
+        "expand-tilde": "2.0.2",
+        "global-modules": "1.0.0"
       }
     },
     "resolve-from": {
@@ -11461,7 +11738,7 @@
       "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
       "dev": true,
       "requires": {
-        "value-or-function": "^3.0.0"
+        "value-or-function": "3.0.0"
       }
     },
     "resolve-url": {
@@ -11476,8 +11753,8 @@
       "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
       "dev": true,
       "requires": {
-        "onetime": "^2.0.0",
-        "signal-exit": "^3.0.2"
+        "onetime": "2.0.1",
+        "signal-exit": "3.0.2"
       }
     },
     "right-align": {
@@ -11486,7 +11763,7 @@
       "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
       "dev": true,
       "requires": {
-        "align-text": "^0.1.1"
+        "align-text": "0.1.4"
       }
     },
     "rimraf": {
@@ -11494,7 +11771,7 @@
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
       "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=",
       "requires": {
-        "glob": "^7.0.5"
+        "glob": "7.1.2"
       }
     },
     "ripemd160": {
@@ -11503,8 +11780,8 @@
       "integrity": "sha1-ocGm9iR1FXe6XQeRTLyShQWFiQw=",
       "dev": true,
       "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
+        "hash-base": "3.0.4",
+        "inherits": "2.0.3"
       }
     },
     "run-async": {
@@ -11513,7 +11790,7 @@
       "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
       "dev": true,
       "requires": {
-        "is-promise": "^2.1.0"
+        "is-promise": "2.1.0"
       }
     },
     "run-queue": {
@@ -11522,7 +11799,7 @@
       "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
       "dev": true,
       "requires": {
-        "aproba": "^1.1.1"
+        "aproba": "1.2.0"
       }
     },
     "rx-lite": {
@@ -11537,7 +11814,7 @@
       "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
       "dev": true,
       "requires": {
-        "rx-lite": "*"
+        "rx-lite": "4.0.8"
       }
     },
     "rxjs": {
@@ -11565,10 +11842,10 @@
       "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
       "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
       "requires": {
-        "glob": "^7.0.0",
-        "lodash": "^4.0.0",
-        "scss-tokenizer": "^0.2.3",
-        "yargs": "^7.0.0"
+        "glob": "7.1.2",
+        "lodash": "4.17.11",
+        "scss-tokenizer": "0.2.3",
+        "yargs": "7.1.0"
       }
     },
     "sass-lint": {
@@ -11577,20 +11854,20 @@
       "integrity": "sha1-Yw9pwhaqIGuCMvsqqQe98zNrbYM=",
       "dev": true,
       "requires": {
-        "commander": "^2.8.1",
-        "eslint": "^2.7.0",
+        "commander": "2.16.0",
+        "eslint": "2.13.1",
         "front-matter": "2.1.2",
-        "fs-extra": "^3.0.1",
-        "glob": "^7.0.0",
-        "globule": "^1.0.0",
-        "gonzales-pe-sl": "^4.2.3",
-        "js-yaml": "^3.5.4",
-        "known-css-properties": "^0.3.0",
-        "lodash.capitalize": "^4.1.0",
-        "lodash.kebabcase": "^4.0.0",
-        "merge": "^1.2.0",
-        "path-is-absolute": "^1.0.0",
-        "util": "^0.10.3"
+        "fs-extra": "3.0.1",
+        "glob": "7.1.2",
+        "globule": "1.2.1",
+        "gonzales-pe-sl": "4.2.3",
+        "js-yaml": "3.7.0",
+        "known-css-properties": "0.3.0",
+        "lodash.capitalize": "4.2.1",
+        "lodash.kebabcase": "4.1.1",
+        "merge": "1.2.0",
+        "path-is-absolute": "1.0.1",
+        "util": "0.10.4"
       },
       "dependencies": {
         "ajv": {
@@ -11599,8 +11876,8 @@
           "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
           "dev": true,
           "requires": {
-            "co": "^4.6.0",
-            "json-stable-stringify": "^1.0.1"
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
           }
         },
         "ajv-keywords": {
@@ -11621,7 +11898,7 @@
           "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
           "dev": true,
           "requires": {
-            "restore-cursor": "^1.0.1"
+            "restore-cursor": "1.0.1"
           }
         },
         "doctrine": {
@@ -11630,8 +11907,8 @@
           "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
           "dev": true,
           "requires": {
-            "esutils": "^2.0.2",
-            "isarray": "^1.0.0"
+            "esutils": "2.0.2",
+            "isarray": "1.0.0"
           }
         },
         "eslint": {
@@ -11640,39 +11917,39 @@
           "integrity": "sha1-5MyPoPAJ+4KaquI4VaKTYL4fbBE=",
           "dev": true,
           "requires": {
-            "chalk": "^1.1.3",
-            "concat-stream": "^1.4.6",
-            "debug": "^2.1.1",
-            "doctrine": "^1.2.2",
-            "es6-map": "^0.1.3",
-            "escope": "^3.6.0",
-            "espree": "^3.1.6",
-            "estraverse": "^4.2.0",
-            "esutils": "^2.0.2",
-            "file-entry-cache": "^1.1.1",
-            "glob": "^7.0.3",
-            "globals": "^9.2.0",
-            "ignore": "^3.1.2",
-            "imurmurhash": "^0.1.4",
-            "inquirer": "^0.12.0",
-            "is-my-json-valid": "^2.10.0",
-            "is-resolvable": "^1.0.0",
-            "js-yaml": "^3.5.1",
-            "json-stable-stringify": "^1.0.0",
-            "levn": "^0.3.0",
-            "lodash": "^4.0.0",
-            "mkdirp": "^0.5.0",
-            "optionator": "^0.8.1",
-            "path-is-absolute": "^1.0.0",
-            "path-is-inside": "^1.0.1",
-            "pluralize": "^1.2.1",
-            "progress": "^1.1.8",
-            "require-uncached": "^1.0.2",
-            "shelljs": "^0.6.0",
-            "strip-json-comments": "~1.0.1",
-            "table": "^3.7.8",
-            "text-table": "~0.2.0",
-            "user-home": "^2.0.0"
+            "chalk": "1.1.3",
+            "concat-stream": "1.6.0",
+            "debug": "2.6.9",
+            "doctrine": "1.5.0",
+            "es6-map": "0.1.5",
+            "escope": "3.6.0",
+            "espree": "3.5.4",
+            "estraverse": "4.2.0",
+            "esutils": "2.0.2",
+            "file-entry-cache": "1.3.1",
+            "glob": "7.1.2",
+            "globals": "9.18.0",
+            "ignore": "3.3.10",
+            "imurmurhash": "0.1.4",
+            "inquirer": "0.12.0",
+            "is-my-json-valid": "2.19.0",
+            "is-resolvable": "1.1.0",
+            "js-yaml": "3.7.0",
+            "json-stable-stringify": "1.0.1",
+            "levn": "0.3.0",
+            "lodash": "4.17.11",
+            "mkdirp": "0.5.1",
+            "optionator": "0.8.2",
+            "path-is-absolute": "1.0.1",
+            "path-is-inside": "1.0.2",
+            "pluralize": "1.2.1",
+            "progress": "1.1.8",
+            "require-uncached": "1.0.3",
+            "shelljs": "0.6.1",
+            "strip-json-comments": "1.0.4",
+            "table": "3.8.3",
+            "text-table": "0.2.0",
+            "user-home": "2.0.0"
           }
         },
         "figures": {
@@ -11681,8 +11958,8 @@
           "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
           "dev": true,
           "requires": {
-            "escape-string-regexp": "^1.0.5",
-            "object-assign": "^4.1.0"
+            "escape-string-regexp": "1.0.5",
+            "object-assign": "4.1.1"
           }
         },
         "file-entry-cache": {
@@ -11691,8 +11968,8 @@
           "integrity": "sha1-RMYepgeuS+nBQC9B9EJwy/4zT/g=",
           "dev": true,
           "requires": {
-            "flat-cache": "^1.2.1",
-            "object-assign": "^4.0.1"
+            "flat-cache": "1.3.0",
+            "object-assign": "4.1.1"
           }
         },
         "fs-extra": {
@@ -11701,9 +11978,9 @@
           "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^3.0.0",
-            "universalify": "^0.1.0"
+            "graceful-fs": "4.1.11",
+            "jsonfile": "3.0.1",
+            "universalify": "0.1.2"
           }
         },
         "globule": {
@@ -11712,9 +11989,9 @@
           "integrity": "sha1-Xf+xsZHyLSB5epNptJ6rTpg5aW0=",
           "dev": true,
           "requires": {
-            "glob": "~7.1.1",
-            "lodash": "~4.17.10",
-            "minimatch": "~3.0.2"
+            "glob": "7.1.2",
+            "lodash": "4.17.11",
+            "minimatch": "3.0.4"
           }
         },
         "inquirer": {
@@ -11723,19 +12000,19 @@
           "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
           "dev": true,
           "requires": {
-            "ansi-escapes": "^1.1.0",
-            "ansi-regex": "^2.0.0",
-            "chalk": "^1.0.0",
-            "cli-cursor": "^1.0.1",
-            "cli-width": "^2.0.0",
-            "figures": "^1.3.5",
-            "lodash": "^4.3.0",
-            "readline2": "^1.0.1",
-            "run-async": "^0.1.0",
-            "rx-lite": "^3.1.2",
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.0",
-            "through": "^2.3.6"
+            "ansi-escapes": "1.4.0",
+            "ansi-regex": "2.1.1",
+            "chalk": "1.1.3",
+            "cli-cursor": "1.0.2",
+            "cli-width": "2.2.0",
+            "figures": "1.7.0",
+            "lodash": "4.17.11",
+            "readline2": "1.0.1",
+            "run-async": "0.1.0",
+            "rx-lite": "3.1.2",
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "through": "2.3.8"
           }
         },
         "is-fullwidth-code-point": {
@@ -11756,7 +12033,7 @@
           "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.6"
+            "graceful-fs": "4.1.11"
           }
         },
         "onetime": {
@@ -11783,8 +12060,8 @@
           "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
           "dev": true,
           "requires": {
-            "exit-hook": "^1.0.0",
-            "onetime": "^1.0.0"
+            "exit-hook": "1.1.1",
+            "onetime": "1.1.0"
           }
         },
         "run-async": {
@@ -11793,7 +12070,7 @@
           "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=",
           "dev": true,
           "requires": {
-            "once": "^1.3.0"
+            "once": "1.4.0"
           }
         },
         "rx-lite": {
@@ -11820,12 +12097,12 @@
           "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=",
           "dev": true,
           "requires": {
-            "ajv": "^4.7.0",
-            "ajv-keywords": "^1.0.0",
-            "chalk": "^1.1.1",
-            "lodash": "^4.0.0",
+            "ajv": "4.11.8",
+            "ajv-keywords": "1.5.1",
+            "chalk": "1.1.3",
+            "lodash": "4.17.11",
             "slice-ansi": "0.0.4",
-            "string-width": "^2.0.0"
+            "string-width": "2.1.1"
           },
           "dependencies": {
             "ansi-regex": {
@@ -11840,8 +12117,8 @@
               "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
               "dev": true,
               "requires": {
-                "is-fullwidth-code-point": "^2.0.0",
-                "strip-ansi": "^4.0.0"
+                "is-fullwidth-code-point": "2.0.0",
+                "strip-ansi": "4.0.0"
               }
             },
             "strip-ansi": {
@@ -11850,7 +12127,7 @@
               "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
               "dev": true,
               "requires": {
-                "ansi-regex": "^3.0.0"
+                "ansi-regex": "3.0.0"
               }
             }
           }
@@ -11861,7 +12138,7 @@
           "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=",
           "dev": true,
           "requires": {
-            "os-homedir": "^1.0.0"
+            "os-homedir": "1.0.2"
           }
         }
       }
@@ -11872,11 +12149,11 @@
       "integrity": "sha1-3S/bPn7v9KU/NbpqxAhxVIg1PQA=",
       "dev": true,
       "requires": {
-        "clone-deep": "^2.0.1",
-        "loader-utils": "^1.0.1",
-        "lodash.tail": "^4.1.1",
-        "neo-async": "^2.5.0",
-        "pify": "^3.0.0"
+        "clone-deep": "2.0.2",
+        "loader-utils": "1.1.0",
+        "lodash.tail": "4.1.1",
+        "neo-async": "2.5.1",
+        "pify": "3.0.0"
       }
     },
     "sax": {
@@ -11891,8 +12168,8 @@
       "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==",
       "dev": true,
       "requires": {
-        "ajv": "^6.1.0",
-        "ajv-keywords": "^3.1.0"
+        "ajv": "6.5.2",
+        "ajv-keywords": "3.2.0"
       },
       "dependencies": {
         "ajv": {
@@ -11901,10 +12178,10 @@
           "integrity": "sha512-hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.1"
+            "fast-deep-equal": "2.0.1",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.4.1",
+            "uri-js": "4.2.2"
           }
         },
         "ajv-keywords": {
@@ -11932,8 +12209,8 @@
       "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
       "requires": {
-        "js-base64": "^2.1.8",
-        "source-map": "^0.4.2"
+        "js-base64": "2.4.5",
+        "source-map": "0.4.4"
       },
       "dependencies": {
         "source-map": {
@@ -11941,7 +12218,7 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "requires": {
-            "amdefine": ">=0.0.4"
+            "amdefine": "1.0.1"
           }
         }
       }
@@ -11957,7 +12234,7 @@
       "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
       "dev": true,
       "requires": {
-        "sver-compat": "^1.5.0"
+        "sver-compat": "1.5.0"
       }
     },
     "sequencify": {
@@ -11983,7 +12260,7 @@
       "integrity": "sha1-12nBgsnVpR9AkUXy+6guXoboA3Y=",
       "dev": true,
       "requires": {
-        "to-object-path": "^0.3.0"
+        "to-object-path": "0.3.0"
       }
     },
     "set-immediate-shim": {
@@ -11998,10 +12275,10 @@
       "integrity": "sha1-ca5KiPD+77v1LR6mBPP7MV67YnQ=",
       "dev": true,
       "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
+        "extend-shallow": "2.0.1",
+        "is-extendable": "0.1.1",
+        "is-plain-object": "2.0.4",
+        "split-string": "3.1.0"
       }
     },
     "setimmediate": {
@@ -12016,8 +12293,8 @@
       "integrity": "sha1-N6XPC4HsvGlD3hCbopYNGyZYSuc=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.1"
       }
     },
     "shallow-clone": {
@@ -12026,9 +12303,9 @@
       "integrity": "sha1-RIDNBuiC72iyrYij6lSDLixItXE=",
       "dev": true,
       "requires": {
-        "is-extendable": "^0.1.1",
-        "kind-of": "^5.0.0",
-        "mixin-object": "^2.0.1"
+        "is-extendable": "0.1.1",
+        "kind-of": "5.1.0",
+        "mixin-object": "2.0.1"
       },
       "dependencies": {
         "kind-of": {
@@ -12045,7 +12322,7 @@
       "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
       "dev": true,
       "requires": {
-        "shebang-regex": "^1.0.0"
+        "shebang-regex": "1.0.0"
       }
     },
     "shebang-regex": {
@@ -12081,9 +12358,9 @@
       "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-2.8.1.tgz",
       "integrity": "sha512-lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw==",
       "requires": {
-        "decompress-response": "^3.3.0",
-        "once": "^1.3.1",
-        "simple-concat": "^1.0.0"
+        "decompress-response": "3.3.0",
+        "once": "1.4.0",
+        "simple-concat": "1.0.0"
       }
     },
     "single-line-log": {
@@ -12092,7 +12369,7 @@
       "integrity": "sha1-wvg/Jzo+GhbtsJlWYdoO1e8DM2Q=",
       "dev": true,
       "requires": {
-        "string-width": "^1.0.1"
+        "string-width": "1.0.2"
       }
     },
     "slash": {
@@ -12107,7 +12384,7 @@
       "integrity": "sha1-BE8aSdiEL/MHqta1Be0Xi9lQE00=",
       "dev": true,
       "requires": {
-        "is-fullwidth-code-point": "^2.0.0"
+        "is-fullwidth-code-point": "2.0.0"
       },
       "dependencies": {
         "is-fullwidth-code-point": {
@@ -12124,14 +12401,14 @@
       "integrity": "sha1-4StUh/re0+PeoKyR6UAL91tAE3A=",
       "dev": true,
       "requires": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^2.0.0"
+        "base": "0.11.2",
+        "debug": "2.6.9",
+        "define-property": "0.2.5",
+        "extend-shallow": "2.0.1",
+        "map-cache": "0.2.2",
+        "source-map": "0.5.7",
+        "source-map-resolve": "0.5.1",
+        "use": "2.0.2"
       },
       "dependencies": {
         "define-property": {
@@ -12140,7 +12417,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         },
         "is-accessor-descriptor": {
@@ -12149,7 +12426,7 @@
           "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           },
           "dependencies": {
             "kind-of": {
@@ -12158,7 +12435,7 @@
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "is-buffer": "1.1.6"
               }
             }
           }
@@ -12169,7 +12446,7 @@
           "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           },
           "dependencies": {
             "kind-of": {
@@ -12178,7 +12455,7 @@
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "is-buffer": "1.1.6"
               }
             }
           }
@@ -12189,9 +12466,9 @@
           "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
+            "is-accessor-descriptor": "0.1.6",
+            "is-data-descriptor": "0.1.4",
+            "kind-of": "5.1.0"
           }
         },
         "kind-of": {
@@ -12208,9 +12485,9 @@
       "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=",
       "dev": true,
       "requires": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
+        "define-property": "1.0.0",
+        "isobject": "3.0.1",
+        "snapdragon-util": "3.0.1"
       }
     },
     "snapdragon-util": {
@@ -12219,7 +12496,7 @@
       "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=",
       "dev": true,
       "requires": {
-        "kind-of": "^3.2.0"
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "kind-of": {
@@ -12228,7 +12505,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -12239,7 +12516,7 @@
       "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
       "dev": true,
       "requires": {
-        "is-plain-obj": "^1.0.0"
+        "is-plain-obj": "1.1.0"
       }
     },
     "source-list-map": {
@@ -12260,11 +12537,11 @@
       "integrity": "sha1-etD1k/IoFZjoVN+A8ZquS5LXoRo=",
       "dev": true,
       "requires": {
-        "atob": "^2.0.0",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
+        "atob": "2.0.3",
+        "decode-uri-component": "0.2.0",
+        "resolve-url": "0.2.1",
+        "source-map-url": "0.4.0",
+        "urix": "0.1.0"
       }
     },
     "source-map-support": {
@@ -12273,7 +12550,7 @@
       "integrity": "sha1-Aoam3ovkJkEzhZTpfM6nXwosWF8=",
       "dev": true,
       "requires": {
-        "source-map": "^0.5.6"
+        "source-map": "0.5.7"
       }
     },
     "source-map-url": {
@@ -12294,9 +12571,9 @@
       "integrity": "sha1-tihSlEmUJgib7qDDwewy1/xXo3Y=",
       "dev": true,
       "requires": {
-        "debug": "^2.5.1",
-        "lodash.assign": "^4.2.0",
-        "rxjs": "^5.1.1"
+        "debug": "2.6.9",
+        "lodash.assign": "4.2.0",
+        "rxjs": "5.5.11"
       }
     },
     "spdx-correct": {
@@ -12304,7 +12581,7 @@
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
       "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
       "requires": {
-        "spdx-license-ids": "^1.0.2"
+        "spdx-license-ids": "1.2.2"
       }
     },
     "spdx-expression-parse": {
@@ -12329,7 +12606,7 @@
       "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
       "dev": true,
       "requires": {
-        "through": "2"
+        "through": "2.3.8"
       }
     },
     "split-string": {
@@ -12338,7 +12615,7 @@
       "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=",
       "dev": true,
       "requires": {
-        "extend-shallow": "^3.0.0"
+        "extend-shallow": "3.0.2"
       },
       "dependencies": {
         "extend-shallow": {
@@ -12347,8 +12624,8 @@
           "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
           "dev": true,
           "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
+            "assign-symbols": "1.0.0",
+            "is-extendable": "1.0.1"
           }
         },
         "is-extendable": {
@@ -12357,7 +12634,7 @@
           "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
           "dev": true,
           "requires": {
-            "is-plain-object": "^2.0.4"
+            "is-plain-object": "2.0.4"
           }
         }
       }
@@ -12373,14 +12650,14 @@
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
       "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
       "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "tweetnacl": "~0.14.0"
+        "asn1": "0.2.3",
+        "assert-plus": "1.0.0",
+        "bcrypt-pbkdf": "1.0.1",
+        "dashdash": "1.14.1",
+        "ecc-jsbn": "0.1.1",
+        "getpass": "0.1.7",
+        "jsbn": "0.1.1",
+        "tweetnacl": "0.14.5"
       }
     },
     "ssri": {
@@ -12389,7 +12666,7 @@
       "integrity": "sha1-ujhyycbTOgcEp9cf8EXl7EiZnQY=",
       "dev": true,
       "requires": {
-        "safe-buffer": "^5.1.1"
+        "safe-buffer": "5.1.1"
       }
     },
     "stack-trace": {
@@ -12404,8 +12681,8 @@
       "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
       "dev": true,
       "requires": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
+        "define-property": "0.2.5",
+        "object-copy": "0.1.0"
       },
       "dependencies": {
         "define-property": {
@@ -12414,7 +12691,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         },
         "is-accessor-descriptor": {
@@ -12423,7 +12700,7 @@
           "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           },
           "dependencies": {
             "kind-of": {
@@ -12432,7 +12709,7 @@
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "is-buffer": "1.1.6"
               }
             }
           }
@@ -12443,7 +12720,7 @@
           "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           },
           "dependencies": {
             "kind-of": {
@@ -12452,7 +12729,7 @@
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "is-buffer": "1.1.6"
               }
             }
           }
@@ -12463,9 +12740,9 @@
           "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
+            "is-accessor-descriptor": "0.1.6",
+            "is-data-descriptor": "0.1.4",
+            "kind-of": "5.1.0"
           }
         },
         "kind-of": {
@@ -12481,7 +12758,7 @@
       "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.0.tgz",
       "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=",
       "requires": {
-        "readable-stream": "^2.0.1"
+        "readable-stream": "2.3.6"
       },
       "dependencies": {
         "isarray": {
@@ -12499,13 +12776,13 @@
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -12513,7 +12790,7 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         }
       }
@@ -12530,8 +12807,8 @@
       "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
       "dev": true,
       "requires": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6"
       },
       "dependencies": {
         "isarray": {
@@ -12552,13 +12829,13 @@
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -12567,7 +12844,7 @@
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         }
       }
@@ -12578,7 +12855,7 @@
       "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
       "dev": true,
       "requires": {
-        "duplexer": "~0.1.1"
+        "duplexer": "0.1.1"
       }
     },
     "stream-consume": {
@@ -12593,8 +12870,8 @@
       "integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==",
       "dev": true,
       "requires": {
-        "end-of-stream": "^1.1.0",
-        "stream-shift": "^1.0.0"
+        "end-of-stream": "1.4.1",
+        "stream-shift": "1.0.0"
       }
     },
     "stream-exhaust": {
@@ -12609,11 +12886,11 @@
       "integrity": "sha1-stJCRpKIpaJ+xP6JM6z2I95lFPw=",
       "dev": true,
       "requires": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
+        "builtin-status-codes": "3.0.0",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6",
+        "to-arraybuffer": "1.0.1",
+        "xtend": "4.0.1"
       },
       "dependencies": {
         "isarray": {
@@ -12634,13 +12911,13 @@
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -12649,7 +12926,7 @@
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         },
         "xtend": {
@@ -12677,9 +12954,9 @@
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
       "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
       "requires": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
+        "code-point-at": "1.1.0",
+        "is-fullwidth-code-point": "1.0.0",
+        "strip-ansi": "3.0.1"
       }
     },
     "string_decoder": {
@@ -12698,7 +12975,7 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "requires": {
-        "ansi-regex": "^2.0.0"
+        "ansi-regex": "2.1.1"
       }
     },
     "strip-bom": {
@@ -12706,7 +12983,7 @@
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
       "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
       "requires": {
-        "is-utf8": "^0.2.0"
+        "is-utf8": "0.2.1"
       }
     },
     "strip-bom-stream": {
@@ -12715,8 +12992,8 @@
       "integrity": "sha1-+H217yYT9paKpUWr/h7HKLaoKco=",
       "dev": true,
       "requires": {
-        "first-chunk-stream": "^2.0.0",
-        "strip-bom": "^2.0.0"
+        "first-chunk-stream": "2.0.0",
+        "strip-bom": "2.0.0"
       },
       "dependencies": {
         "first-chunk-stream": {
@@ -12725,7 +13002,7 @@
           "integrity": "sha1-G97NuOCDwGZLkZRVgVd6Q6nzHXA=",
           "dev": true,
           "requires": {
-            "readable-stream": "^2.0.2"
+            "readable-stream": "2.3.6"
           }
         },
         "isarray": {
@@ -12746,13 +13023,13 @@
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -12761,7 +13038,7 @@
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         }
       }
@@ -12777,7 +13054,7 @@
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
       "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
       "requires": {
-        "get-stdin": "^4.0.1"
+        "get-stdin": "4.0.1"
       }
     },
     "strip-json-comments": {
@@ -12791,7 +13068,7 @@
       "integrity": "sha1-D0LBDl0F2l1C7qPlbDOZo31sWz4=",
       "dev": true,
       "requires": {
-        "debug": "^2.2.0"
+        "debug": "2.6.9"
       }
     },
     "supports-color": {
@@ -12805,8 +13082,8 @@
       "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
       "dev": true,
       "requires": {
-        "es6-iterator": "^2.0.1",
-        "es6-symbol": "^3.1.1"
+        "es6-iterator": "2.0.3",
+        "es6-symbol": "3.1.1"
       }
     },
     "svgo": {
@@ -12815,13 +13092,13 @@
       "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=",
       "dev": true,
       "requires": {
-        "coa": "~1.0.1",
-        "colors": "~1.1.2",
-        "csso": "~2.3.1",
-        "js-yaml": "~3.7.0",
-        "mkdirp": "~0.5.1",
-        "sax": "~1.2.1",
-        "whet.extend": "~0.9.9"
+        "coa": "1.0.4",
+        "colors": "1.1.2",
+        "csso": "2.3.2",
+        "js-yaml": "3.7.0",
+        "mkdirp": "0.5.1",
+        "sax": "1.2.4",
+        "whet.extend": "0.9.9"
       }
     },
     "symbol-observable": {
@@ -12836,12 +13113,12 @@
       "integrity": "sha1-ozRHN1OR52atNNNIbm4q7chNLjY=",
       "dev": true,
       "requires": {
-        "ajv": "^5.2.3",
-        "ajv-keywords": "^2.1.0",
-        "chalk": "^2.1.0",
-        "lodash": "^4.17.4",
+        "ajv": "5.5.2",
+        "ajv-keywords": "2.1.1",
+        "chalk": "2.4.1",
+        "lodash": "4.17.11",
         "slice-ansi": "1.0.0",
-        "string-width": "^2.1.1"
+        "string-width": "2.1.1"
       },
       "dependencies": {
         "ansi-regex": {
@@ -12856,7 +13133,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "^1.9.0"
+            "color-convert": "1.9.2"
           }
         },
         "chalk": {
@@ -12865,9 +13142,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
           }
         },
         "has-flag": {
@@ -12888,8 +13165,8 @@
           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
           }
         },
         "strip-ansi": {
@@ -12898,7 +13175,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "3.0.0"
           }
         },
         "supports-color": {
@@ -12907,7 +13184,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -12923,9 +13200,9 @@
       "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
       "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
       "requires": {
-        "block-stream": "*",
-        "fstream": "^1.0.2",
-        "inherits": "2"
+        "block-stream": "0.0.9",
+        "fstream": "1.0.11",
+        "inherits": "2.0.3"
       }
     },
     "tar-fs": {
@@ -12933,10 +13210,10 @@
       "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.3.tgz",
       "integrity": "sha512-NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw==",
       "requires": {
-        "chownr": "^1.0.1",
-        "mkdirp": "^0.5.1",
-        "pump": "^1.0.0",
-        "tar-stream": "^1.1.2"
+        "chownr": "1.0.1",
+        "mkdirp": "0.5.1",
+        "pump": "1.0.3",
+        "tar-stream": "1.5.5"
       },
       "dependencies": {
         "pump": {
@@ -12944,8 +13221,8 @@
           "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz",
           "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==",
           "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
+            "end-of-stream": "1.4.1",
+            "once": "1.4.0"
           }
         }
       }
@@ -12955,10 +13232,10 @@
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz",
       "integrity": "sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg==",
       "requires": {
-        "bl": "^1.0.0",
-        "end-of-stream": "^1.0.0",
-        "readable-stream": "^2.0.0",
-        "xtend": "^4.0.0"
+        "bl": "1.2.2",
+        "end-of-stream": "1.4.1",
+        "readable-stream": "2.3.5",
+        "xtend": "4.0.1"
       },
       "dependencies": {
         "end-of-stream": {
@@ -12966,7 +13243,7 @@
           "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
           "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
           "requires": {
-            "once": "^1.4.0"
+            "once": "1.4.0"
           }
         },
         "isarray": {
@@ -12984,13 +13261,13 @@
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
           "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.0.3",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.0.3",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -12998,7 +13275,7 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
           "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         },
         "xtend": {
@@ -13032,8 +13309,8 @@
       "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
       "dev": true,
       "requires": {
-        "readable-stream": "~1.1.9",
-        "xtend": "~2.1.1"
+        "readable-stream": "1.1.14",
+        "xtend": "2.1.2"
       }
     },
     "through2-filter": {
@@ -13042,8 +13319,8 @@
       "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=",
       "dev": true,
       "requires": {
-        "through2": "~2.0.0",
-        "xtend": "~4.0.0"
+        "through2": "2.0.3",
+        "xtend": "4.0.1"
       },
       "dependencies": {
         "isarray": {
@@ -13064,13 +13341,13 @@
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -13079,7 +13356,7 @@
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         },
         "through2": {
@@ -13088,8 +13365,8 @@
           "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
           "dev": true,
           "requires": {
-            "readable-stream": "^2.1.5",
-            "xtend": "~4.0.1"
+            "readable-stream": "2.3.6",
+            "xtend": "4.0.1"
           }
         },
         "xtend": {
@@ -13106,7 +13383,7 @@
       "integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=",
       "dev": true,
       "requires": {
-        "os-homedir": "^1.0.0"
+        "os-homedir": "1.0.2"
       }
     },
     "time-stamp": {
@@ -13121,7 +13398,7 @@
       "integrity": "sha1-HSjj0qrfHVpZlsTp+VYBzQU0gK4=",
       "dev": true,
       "requires": {
-        "setimmediate": "^1.0.4"
+        "setimmediate": "1.0.5"
       }
     },
     "tinycolor2": {
@@ -13136,7 +13413,7 @@
       "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=",
       "dev": true,
       "requires": {
-        "os-tmpdir": "~1.0.2"
+        "os-tmpdir": "1.0.2"
       }
     },
     "to-absolute-glob": {
@@ -13145,8 +13422,8 @@
       "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
       "dev": true,
       "requires": {
-        "is-absolute": "^1.0.0",
-        "is-negated-glob": "^1.0.0"
+        "is-absolute": "1.0.0",
+        "is-negated-glob": "1.0.0"
       }
     },
     "to-arraybuffer": {
@@ -13167,7 +13444,7 @@
       "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2"
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "kind-of": {
@@ -13176,7 +13453,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -13187,9 +13464,9 @@
       "integrity": "sha1-FTWL7kosg712N3uh3ASdDxiDeq4=",
       "dev": true,
       "requires": {
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "regex-not": "^1.0.0"
+        "define-property": "0.2.5",
+        "extend-shallow": "2.0.1",
+        "regex-not": "1.0.0"
       },
       "dependencies": {
         "define-property": {
@@ -13198,7 +13475,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         },
         "is-accessor-descriptor": {
@@ -13207,7 +13484,7 @@
           "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           },
           "dependencies": {
             "kind-of": {
@@ -13216,7 +13493,7 @@
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "is-buffer": "1.1.6"
               }
             }
           }
@@ -13227,7 +13504,7 @@
           "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           },
           "dependencies": {
             "kind-of": {
@@ -13236,7 +13513,7 @@
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "is-buffer": "1.1.6"
               }
             }
           }
@@ -13247,9 +13524,9 @@
           "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
+            "is-accessor-descriptor": "0.1.6",
+            "is-data-descriptor": "0.1.4",
+            "kind-of": "5.1.0"
           }
         },
         "kind-of": {
@@ -13266,8 +13543,8 @@
       "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
       "dev": true,
       "requires": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
+        "is-number": "3.0.0",
+        "repeat-string": "1.6.1"
       }
     },
     "to-through": {
@@ -13276,7 +13553,7 @@
       "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
       "dev": true,
       "requires": {
-        "through2": "^2.0.3"
+        "through2": "2.0.3"
       },
       "dependencies": {
         "isarray": {
@@ -13297,13 +13574,13 @@
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
@@ -13312,7 +13589,7 @@
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         },
         "through2": {
@@ -13321,8 +13598,8 @@
           "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
           "dev": true,
           "requires": {
-            "readable-stream": "^2.1.5",
-            "xtend": "~4.0.1"
+            "readable-stream": "2.3.6",
+            "xtend": "4.0.1"
           }
         },
         "xtend": {
@@ -13344,7 +13621,7 @@
       "resolved": "https://registry.npmjs.org/touch/-/touch-0.0.3.tgz",
       "integrity": "sha1-Ua7z1ElXHU8oel2Hyci0kYGg2x0=",
       "requires": {
-        "nopt": "~1.0.10"
+        "nopt": "1.0.10"
       },
       "dependencies": {
         "nopt": {
@@ -13352,7 +13629,7 @@
           "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
           "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
           "requires": {
-            "abbrev": "1"
+            "abbrev": "1.1.1"
           }
         }
       }
@@ -13362,7 +13639,7 @@
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
       "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
       "requires": {
-        "punycode": "^1.4.1"
+        "punycode": "1.4.1"
       }
     },
     "traverse": {
@@ -13386,7 +13663,7 @@
       "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.2.tgz",
       "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=",
       "requires": {
-        "glob": "^6.0.4"
+        "glob": "6.0.4"
       },
       "dependencies": {
         "glob": {
@@ -13394,11 +13671,11 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
           "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
           "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
           }
         }
       }
@@ -13414,7 +13691,7 @@
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
       "requires": {
-        "safe-buffer": "^5.0.1"
+        "safe-buffer": "5.1.1"
       }
     },
     "tweetnacl": {
@@ -13429,7 +13706,7 @@
       "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
       "dev": true,
       "requires": {
-        "prelude-ls": "~1.1.2"
+        "prelude-ls": "1.1.2"
       }
     },
     "typedarray": {
@@ -13444,8 +13721,8 @@
       "integrity": "sha512-RbOgGjF04sFUNSi8xGOTB9AmtVmMmVVAL5a7lxIgJ8urejJen+priq0ooRIHHa8AXI/dSvNF9yYMz9OP4PhybQ==",
       "dev": true,
       "requires": {
-        "commander": "~2.16.0",
-        "source-map": "~0.6.1"
+        "commander": "2.16.0",
+        "source-map": "0.6.1"
       },
       "dependencies": {
         "commander": {
@@ -13475,14 +13752,14 @@
       "integrity": "sha512-1VicfKhCYHLS8m1DCApqBhoulnASsEoJ/BvpUpP4zoNAPpKzdH+ghk0olGJMmwX2/jprK2j3hAHdUbczBSy2FA==",
       "dev": true,
       "requires": {
-        "cacache": "^10.0.4",
-        "find-cache-dir": "^1.0.0",
-        "schema-utils": "^0.4.5",
-        "serialize-javascript": "^1.4.0",
-        "source-map": "^0.6.1",
-        "uglify-es": "^3.3.4",
-        "webpack-sources": "^1.1.0",
-        "worker-farm": "^1.5.2"
+        "cacache": "10.0.4",
+        "find-cache-dir": "1.0.0",
+        "schema-utils": "0.4.5",
+        "serialize-javascript": "1.5.0",
+        "source-map": "0.6.1",
+        "uglify-es": "3.3.9",
+        "webpack-sources": "1.1.0",
+        "worker-farm": "1.6.0"
       },
       "dependencies": {
         "commander": {
@@ -13503,8 +13780,8 @@
           "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
           "dev": true,
           "requires": {
-            "commander": "~2.13.0",
-            "source-map": "~0.6.1"
+            "commander": "2.13.0",
+            "source-map": "0.6.1"
           }
         }
       }
@@ -13526,15 +13803,15 @@
       "integrity": "sha1-M52kZGJS0ILcN45wgGcpl1DhG0k=",
       "dev": true,
       "requires": {
-        "arr-flatten": "^1.0.1",
-        "arr-map": "^2.0.0",
-        "bach": "^1.0.0",
-        "collection-map": "^1.0.0",
-        "es6-weak-map": "^2.0.1",
-        "last-run": "^1.1.0",
-        "object.defaults": "^1.0.0",
-        "object.reduce": "^1.0.0",
-        "undertaker-registry": "^1.0.0"
+        "arr-flatten": "1.1.0",
+        "arr-map": "2.0.2",
+        "bach": "1.2.0",
+        "collection-map": "1.0.0",
+        "es6-weak-map": "2.0.2",
+        "last-run": "1.1.1",
+        "object.defaults": "1.1.0",
+        "object.reduce": "1.0.1",
+        "undertaker-registry": "1.0.1"
       }
     },
     "undertaker-registry": {
@@ -13549,10 +13826,10 @@
       "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
       "dev": true,
       "requires": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^0.4.3"
+        "arr-union": "3.1.0",
+        "get-value": "2.0.6",
+        "is-extendable": "0.1.1",
+        "set-value": "0.4.3"
       },
       "dependencies": {
         "set-value": {
@@ -13561,10 +13838,10 @@
           "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
           "dev": true,
           "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-extendable": "^0.1.1",
-            "is-plain-object": "^2.0.1",
-            "to-object-path": "^0.3.0"
+            "extend-shallow": "2.0.1",
+            "is-extendable": "0.1.1",
+            "is-plain-object": "2.0.4",
+            "to-object-path": "0.3.0"
           }
         }
       }
@@ -13587,7 +13864,7 @@
       "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=",
       "dev": true,
       "requires": {
-        "unique-slug": "^2.0.0"
+        "unique-slug": "2.0.0"
       }
     },
     "unique-slug": {
@@ -13596,7 +13873,7 @@
       "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=",
       "dev": true,
       "requires": {
-        "imurmurhash": "^0.1.4"
+        "imurmurhash": "0.1.4"
       }
     },
     "unique-stream": {
@@ -13605,8 +13882,8 @@
       "integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=",
       "dev": true,
       "requires": {
-        "json-stable-stringify": "^1.0.0",
-        "through2-filter": "^2.0.0"
+        "json-stable-stringify": "1.0.1",
+        "through2-filter": "2.0.0"
       }
     },
     "universalify": {
@@ -13620,8 +13897,8 @@
       "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
       "dev": true,
       "requires": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
+        "has-value": "0.3.1",
+        "isobject": "3.0.1"
       },
       "dependencies": {
         "has-value": {
@@ -13630,9 +13907,9 @@
           "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
           "dev": true,
           "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
+            "get-value": "2.0.6",
+            "has-values": "0.1.4",
+            "isobject": "2.1.0"
           },
           "dependencies": {
             "isobject": {
@@ -13677,7 +13954,7 @@
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
       "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=",
       "requires": {
-        "punycode": "^2.1.0"
+        "punycode": "2.1.1"
       },
       "dependencies": {
         "punycode": {
@@ -13717,9 +13994,9 @@
       "integrity": "sha1-riig1y+TvyJCKhii43mZMRLeyOg=",
       "dev": true,
       "requires": {
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "lazy-cache": "^2.0.2"
+        "define-property": "0.2.5",
+        "isobject": "3.0.1",
+        "lazy-cache": "2.0.2"
       },
       "dependencies": {
         "define-property": {
@@ -13728,7 +14005,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         },
         "is-accessor-descriptor": {
@@ -13737,7 +14014,7 @@
           "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           },
           "dependencies": {
             "kind-of": {
@@ -13746,7 +14023,7 @@
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "is-buffer": "1.1.6"
               }
             }
           }
@@ -13757,7 +14034,7 @@
           "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "kind-of": "3.2.2"
           },
           "dependencies": {
             "kind-of": {
@@ -13766,7 +14043,7 @@
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "is-buffer": "1.1.6"
               }
             }
           }
@@ -13777,9 +14054,9 @@
           "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
+            "is-accessor-descriptor": "0.1.6",
+            "is-data-descriptor": "0.1.4",
+            "kind-of": "5.1.0"
           }
         },
         "kind-of": {
@@ -13816,8 +14093,8 @@
       "integrity": "sha1-RA9xZaRZyaFtwUXrjnLzVocJcDA=",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "object.getownpropertydescriptors": "^2.0.3"
+        "define-properties": "1.1.2",
+        "object.getownpropertydescriptors": "2.0.3"
       }
     },
     "utila": {
@@ -13837,9 +14114,9 @@
       "integrity": "sha1-ePfY6cNCZWIr5lup3HjGfx3AK3M=",
       "dev": true,
       "requires": {
-        "lodash.merge": "^4.6.0",
-        "popper.js": "^1.12.9",
-        "vue-resize": "^0.4.3"
+        "lodash.merge": "4.6.1",
+        "popper.js": "1.14.3",
+        "vue-resize": "0.4.4"
       }
     },
     "v8flags": {
@@ -13848,7 +14125,7 @@
       "integrity": "sha1-QiWaFGHAg5fjf+HU8c+1nK2FoFM=",
       "dev": true,
       "requires": {
-        "homedir-polyfill": "^1.0.1"
+        "homedir-polyfill": "1.0.1"
       }
     },
     "validate-npm-package-license": {
@@ -13856,8 +14133,8 @@
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
       "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
       "requires": {
-        "spdx-correct": "~1.0.0",
-        "spdx-expression-parse": "~1.0.0"
+        "spdx-correct": "1.0.2",
+        "spdx-expression-parse": "1.0.4"
       }
     },
     "value-or-function": {
@@ -13877,9 +14154,9 @@
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
       "requires": {
-        "assert-plus": "^1.0.0",
+        "assert-plus": "1.0.0",
         "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
+        "extsprintf": "1.3.0"
       }
     },
     "vinyl": {
@@ -13888,8 +14165,8 @@
       "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
       "dev": true,
       "requires": {
-        "clone": "^1.0.0",
-        "clone-stats": "^0.0.1",
+        "clone": "1.0.3",
+        "clone-stats": "0.0.1",
         "replace-ext": "0.0.1"
       }
     },
@@ -13899,12 +14176,12 @@
       "integrity": "sha1-p+v1/779obfRjRQPyweyI++2dRo=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.3.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0",
-        "strip-bom-stream": "^2.0.0",
-        "vinyl": "^1.1.0"
+        "graceful-fs": "4.1.11",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1",
+        "strip-bom": "2.0.0",
+        "strip-bom-stream": "2.0.0",
+        "vinyl": "1.2.0"
       },
       "dependencies": {
         "pify": {
@@ -13919,8 +14196,8 @@
           "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
           "dev": true,
           "requires": {
-            "clone": "^1.0.0",
-            "clone-stats": "^0.0.1",
+            "clone": "1.0.3",
+            "clone-stats": "0.0.1",
             "replace-ext": "0.0.1"
           }
         }
@@ -13932,23 +14209,23 @@
       "integrity": "sha1-yFhJQF9nQo/qu71cXb3WT0fTG8c=",
       "dev": true,
       "requires": {
-        "fs-mkdirp-stream": "^1.0.0",
-        "glob-stream": "^6.1.0",
-        "graceful-fs": "^4.0.0",
-        "is-valid-glob": "^1.0.0",
-        "lazystream": "^1.0.0",
-        "lead": "^1.0.0",
-        "object.assign": "^4.0.4",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.3.3",
-        "remove-bom-buffer": "^3.0.0",
-        "remove-bom-stream": "^1.2.0",
-        "resolve-options": "^1.1.0",
-        "through2": "^2.0.0",
-        "to-through": "^2.0.0",
-        "value-or-function": "^3.0.0",
-        "vinyl": "^2.0.0",
-        "vinyl-sourcemap": "^1.1.0"
+        "fs-mkdirp-stream": "1.0.0",
+        "glob-stream": "6.1.0",
+        "graceful-fs": "4.1.11",
+        "is-valid-glob": "1.0.0",
+        "lazystream": "1.0.0",
+        "lead": "1.0.0",
+        "object.assign": "4.1.0",
+        "pumpify": "1.4.0",
+        "readable-stream": "2.3.6",
+        "remove-bom-buffer": "3.0.0",
+        "remove-bom-stream": "1.2.0",
+        "resolve-options": "1.1.0",
+        "through2": "2.0.3",
+        "to-through": "2.0.0",
+        "value-or-function": "3.0.0",
+        "vinyl": "2.2.0",
+        "vinyl-sourcemap": "1.1.0"
       },
       "dependencies": {
         "clone": {
@@ -13981,13 +14258,13 @@
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         },
         "replace-ext": {
@@ -14002,7 +14279,7 @@
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.1"
           }
         },
         "through2": {
@@ -14011,8 +14288,8 @@
           "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
           "dev": true,
           "requires": {
-            "readable-stream": "^2.1.5",
-            "xtend": "~4.0.1"
+            "readable-stream": "2.3.6",
+            "xtend": "4.0.1"
           }
         },
         "vinyl": {
@@ -14021,12 +14298,12 @@
           "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
           "dev": true,
           "requires": {
-            "clone": "^2.1.1",
-            "clone-buffer": "^1.0.0",
-            "clone-stats": "^1.0.0",
-            "cloneable-readable": "^1.0.0",
-            "remove-trailing-separator": "^1.0.1",
-            "replace-ext": "^1.0.0"
+            "clone": "2.1.1",
+            "clone-buffer": "1.0.0",
+            "clone-stats": "1.0.0",
+            "cloneable-readable": "1.0.0",
+            "remove-trailing-separator": "1.1.0",
+            "replace-ext": "1.0.0"
           }
         },
         "xtend": {
@@ -14043,13 +14320,13 @@
       "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
       "dev": true,
       "requires": {
-        "append-buffer": "^1.0.2",
-        "convert-source-map": "^1.5.0",
-        "graceful-fs": "^4.1.6",
-        "normalize-path": "^2.1.1",
-        "now-and-later": "^2.0.0",
-        "remove-bom-buffer": "^3.0.0",
-        "vinyl": "^2.0.0"
+        "append-buffer": "1.0.2",
+        "convert-source-map": "1.5.1",
+        "graceful-fs": "4.1.11",
+        "normalize-path": "2.1.1",
+        "now-and-later": "2.0.0",
+        "remove-bom-buffer": "3.0.0",
+        "vinyl": "2.2.0"
       },
       "dependencies": {
         "clone": {
@@ -14076,12 +14353,12 @@
           "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
           "dev": true,
           "requires": {
-            "clone": "^2.1.1",
-            "clone-buffer": "^1.0.0",
-            "clone-stats": "^1.0.0",
-            "cloneable-readable": "^1.0.0",
-            "remove-trailing-separator": "^1.0.1",
-            "replace-ext": "^1.0.0"
+            "clone": "2.1.1",
+            "clone-buffer": "1.0.0",
+            "clone-stats": "1.0.0",
+            "cloneable-readable": "1.0.0",
+            "remove-trailing-separator": "1.1.0",
+            "replace-ext": "1.0.0"
           }
         }
       }
@@ -14092,7 +14369,7 @@
       "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=",
       "dev": true,
       "requires": {
-        "source-map": "^0.5.1"
+        "source-map": "0.5.7"
       }
     },
     "vm-browserify": {
@@ -14116,8 +14393,8 @@
       "integrity": "sha1-OnhNRU+/sXznabn8kPEOmGhofss=",
       "dev": true,
       "requires": {
-        "codemirror": "^5.32.0",
-        "diff-match-patch": "^1.0.0"
+        "codemirror": "5.39.2",
+        "diff-match-patch": "1.0.1"
       }
     },
     "vue-color": {
@@ -14126,9 +14403,9 @@
       "integrity": "sha512-kGz1LNu1DKIcT8jQmUeSjQNqh9NGYBCvMFXU43MRF4kg7A33Z4tZMQFLrPrX7d8r3ptbmLq+MaclJiVQFMCMqg==",
       "dev": true,
       "requires": {
-        "lodash.throttle": "^4.0.0",
-        "material-colors": "^1.0.0",
-        "tinycolor2": "^1.1.2"
+        "lodash.throttle": "4.1.1",
+        "material-colors": "1.2.6",
+        "tinycolor2": "1.4.1"
       }
     },
     "vue-context-menu": {
@@ -14143,12 +14420,12 @@
       "integrity": "sha1-wmjJbG2Uz+PZOKX3WTlZsMozYNE=",
       "dev": true,
       "requires": {
-        "debug": "^3.1.0",
-        "eslint-scope": "^3.7.1",
-        "eslint-visitor-keys": "^1.0.0",
-        "espree": "^3.5.2",
-        "esquery": "^1.0.0",
-        "lodash": "^4.17.4"
+        "debug": "3.1.0",
+        "eslint-scope": "3.7.1",
+        "eslint-visitor-keys": "1.0.0",
+        "espree": "3.5.4",
+        "esquery": "1.0.1",
+        "lodash": "4.17.11"
       },
       "dependencies": {
         "debug": {
@@ -14174,19 +14451,19 @@
       "integrity": "sha512-pgFWFsUjYO1v+J+3r7K0Q4lCp0eOyI24/q9j+cCudWyCTjgpjpcAa1MdwjlDUUettt9xkkUBbQ9fkAN1NC8t9w==",
       "dev": true,
       "requires": {
-        "consolidate": "^0.14.0",
-        "hash-sum": "^1.0.2",
-        "loader-utils": "^1.1.0",
-        "lru-cache": "^4.1.1",
-        "postcss": "^6.0.8",
-        "postcss-load-config": "^1.1.0",
-        "postcss-selector-parser": "^2.0.0",
-        "prettier": "^1.7.0",
-        "resolve": "^1.4.0",
-        "source-map": "^0.6.1",
-        "vue-hot-reload-api": "^2.2.0",
-        "vue-style-loader": "^3.0.0",
-        "vue-template-es2015-compiler": "^1.6.0"
+        "consolidate": "0.14.5",
+        "hash-sum": "1.0.2",
+        "loader-utils": "1.1.0",
+        "lru-cache": "4.1.3",
+        "postcss": "6.0.23",
+        "postcss-load-config": "1.2.0",
+        "postcss-selector-parser": "2.2.3",
+        "prettier": "1.13.7",
+        "resolve": "1.5.0",
+        "source-map": "0.6.1",
+        "vue-hot-reload-api": "2.3.0",
+        "vue-style-loader": "3.1.2",
+        "vue-template-es2015-compiler": "1.6.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -14195,7 +14472,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "^1.9.0"
+            "color-convert": "1.9.2"
           }
         },
         "chalk": {
@@ -14204,9 +14481,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
           }
         },
         "has-flag": {
@@ -14221,8 +14498,8 @@
           "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
           "dev": true,
           "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
+            "pseudomap": "1.0.2",
+            "yallist": "2.1.2"
           }
         },
         "postcss": {
@@ -14231,9 +14508,9 @@
           "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
+            "chalk": "2.4.1",
+            "source-map": "0.6.1",
+            "supports-color": "5.4.0"
           }
         },
         "source-map": {
@@ -14248,7 +14525,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -14271,8 +14548,8 @@
       "integrity": "sha1-a2atNJmPyVIMLx5NX6QJFkHBWXo=",
       "dev": true,
       "requires": {
-        "hash-sum": "^1.0.2",
-        "loader-utils": "^1.0.2"
+        "hash-sum": "1.0.2",
+        "loader-utils": "1.1.0"
       }
     },
     "vue-template-compiler": {
@@ -14281,8 +14558,8 @@
       "integrity": "sha1-UqSgeMMn3rk3SCpQmuhcBvNGw8s=",
       "dev": true,
       "requires": {
-        "de-indent": "^1.0.2",
-        "he": "^1.1.0"
+        "de-indent": "1.0.2",
+        "he": "1.1.1"
       }
     },
     "vue-template-es2015-compiler": {
@@ -14297,9 +14574,9 @@
       "integrity": "sha1-S8EsLr6KonenHx0/FNaFx7RGzQA=",
       "dev": true,
       "requires": {
-        "chokidar": "^2.0.2",
-        "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
+        "chokidar": "2.0.2",
+        "graceful-fs": "4.1.11",
+        "neo-async": "2.5.1"
       }
     },
     "webpack": {
@@ -14308,28 +14585,28 @@
       "integrity": "sha1-P540NgNwYC/PY56Xk520hvTsDXQ=",
       "dev": true,
       "requires": {
-        "acorn": "^5.0.0",
-        "acorn-dynamic-import": "^2.0.0",
-        "ajv": "^6.1.0",
-        "ajv-keywords": "^3.1.0",
-        "async": "^2.1.2",
-        "enhanced-resolve": "^3.4.0",
-        "escope": "^3.6.0",
-        "interpret": "^1.0.0",
-        "json-loader": "^0.5.4",
-        "json5": "^0.5.1",
-        "loader-runner": "^2.3.0",
-        "loader-utils": "^1.1.0",
-        "memory-fs": "~0.4.1",
-        "mkdirp": "~0.5.0",
-        "node-libs-browser": "^2.0.0",
-        "source-map": "^0.5.3",
-        "supports-color": "^4.2.1",
-        "tapable": "^0.2.7",
-        "uglifyjs-webpack-plugin": "^0.4.6",
-        "watchpack": "^1.4.0",
-        "webpack-sources": "^1.0.1",
-        "yargs": "^8.0.2"
+        "acorn": "5.7.1",
+        "acorn-dynamic-import": "2.0.2",
+        "ajv": "6.5.2",
+        "ajv-keywords": "3.2.0",
+        "async": "2.6.0",
+        "enhanced-resolve": "3.4.1",
+        "escope": "3.6.0",
+        "interpret": "1.1.0",
+        "json-loader": "0.5.7",
+        "json5": "0.5.1",
+        "loader-runner": "2.3.0",
+        "loader-utils": "1.1.0",
+        "memory-fs": "0.4.1",
+        "mkdirp": "0.5.1",
+        "node-libs-browser": "2.1.0",
+        "source-map": "0.5.7",
+        "supports-color": "4.5.0",
+        "tapable": "0.2.8",
+        "uglifyjs-webpack-plugin": "0.4.6",
+        "watchpack": "1.6.0",
+        "webpack-sources": "1.1.0",
+        "yargs": "8.0.2"
       },
       "dependencies": {
         "ajv": {
@@ -14338,10 +14615,10 @@
           "integrity": "sha512-hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.1"
+            "fast-deep-equal": "2.0.1",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.4.1",
+            "uri-js": "4.2.2"
           }
         },
         "ajv-keywords": {
@@ -14368,8 +14645,8 @@
           "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
           "dev": true,
           "requires": {
-            "center-align": "^0.1.1",
-            "right-align": "^0.1.1",
+            "center-align": "0.1.3",
+            "right-align": "0.1.3",
             "wordwrap": "0.0.2"
           }
         },
@@ -14397,10 +14674,10 @@
           "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "strip-bom": "^3.0.0"
+            "graceful-fs": "4.1.11",
+            "parse-json": "2.2.0",
+            "pify": "2.3.0",
+            "strip-bom": "3.0.0"
           }
         },
         "os-locale": {
@@ -14409,9 +14686,9 @@
           "integrity": "sha1-QrwpAKa1uL0XN2yOiCtlr8zyS/I=",
           "dev": true,
           "requires": {
-            "execa": "^0.7.0",
-            "lcid": "^1.0.0",
-            "mem": "^1.1.0"
+            "execa": "0.7.0",
+            "lcid": "1.0.0",
+            "mem": "1.1.0"
           }
         },
         "path-type": {
@@ -14420,7 +14697,7 @@
           "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
           "dev": true,
           "requires": {
-            "pify": "^2.0.0"
+            "pify": "2.3.0"
           }
         },
         "pify": {
@@ -14435,9 +14712,9 @@
           "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
           "dev": true,
           "requires": {
-            "load-json-file": "^2.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^2.0.0"
+            "load-json-file": "2.0.0",
+            "normalize-package-data": "2.4.0",
+            "path-type": "2.0.0"
           }
         },
         "read-pkg-up": {
@@ -14446,8 +14723,8 @@
           "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
           "dev": true,
           "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^2.0.0"
+            "find-up": "2.1.0",
+            "read-pkg": "2.0.0"
           }
         },
         "string-width": {
@@ -14456,8 +14733,8 @@
           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
           },
           "dependencies": {
             "is-fullwidth-code-point": {
@@ -14472,7 +14749,7 @@
               "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
               "dev": true,
               "requires": {
-                "ansi-regex": "^3.0.0"
+                "ansi-regex": "3.0.0"
               }
             }
           }
@@ -14489,7 +14766,7 @@
           "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
           "dev": true,
           "requires": {
-            "has-flag": "^2.0.0"
+            "has-flag": "2.0.0"
           }
         },
         "tapable": {
@@ -14504,9 +14781,9 @@
           "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
           "dev": true,
           "requires": {
-            "source-map": "~0.5.1",
-            "uglify-to-browserify": "~1.0.0",
-            "yargs": "~3.10.0"
+            "source-map": "0.5.7",
+            "uglify-to-browserify": "1.0.2",
+            "yargs": "3.10.0"
           },
           "dependencies": {
             "yargs": {
@@ -14515,9 +14792,9 @@
               "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
               "dev": true,
               "requires": {
-                "camelcase": "^1.0.2",
-                "cliui": "^2.1.0",
-                "decamelize": "^1.0.0",
+                "camelcase": "1.2.1",
+                "cliui": "2.1.0",
+                "decamelize": "1.2.0",
                 "window-size": "0.1.0"
               }
             }
@@ -14529,9 +14806,9 @@
           "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
           "dev": true,
           "requires": {
-            "source-map": "^0.5.6",
-            "uglify-js": "^2.8.29",
-            "webpack-sources": "^1.0.1"
+            "source-map": "0.5.7",
+            "uglify-js": "2.8.29",
+            "webpack-sources": "1.1.0"
           }
         },
         "which-module": {
@@ -14552,19 +14829,19 @@
           "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
           "dev": true,
           "requires": {
-            "camelcase": "^4.1.0",
-            "cliui": "^3.2.0",
-            "decamelize": "^1.1.1",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^2.0.0",
-            "read-pkg-up": "^2.0.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "^7.0.0"
+            "camelcase": "4.1.0",
+            "cliui": "3.2.0",
+            "decamelize": "1.2.0",
+            "get-caller-file": "1.0.2",
+            "os-locale": "2.1.0",
+            "read-pkg-up": "2.0.0",
+            "require-directory": "2.1.1",
+            "require-main-filename": "1.0.1",
+            "set-blocking": "2.0.0",
+            "string-width": "2.1.1",
+            "which-module": "2.0.0",
+            "y18n": "3.2.1",
+            "yargs-parser": "7.0.0"
           },
           "dependencies": {
             "camelcase": {
@@ -14579,9 +14856,9 @@
               "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
               "dev": true,
               "requires": {
-                "string-width": "^1.0.1",
-                "strip-ansi": "^3.0.1",
-                "wrap-ansi": "^2.0.0"
+                "string-width": "1.0.2",
+                "strip-ansi": "3.0.1",
+                "wrap-ansi": "2.1.0"
               },
               "dependencies": {
                 "string-width": {
@@ -14590,9 +14867,9 @@
                   "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
                   "dev": true,
                   "requires": {
-                    "code-point-at": "^1.0.0",
-                    "is-fullwidth-code-point": "^1.0.0",
-                    "strip-ansi": "^3.0.0"
+                    "code-point-at": "1.1.0",
+                    "is-fullwidth-code-point": "1.0.0",
+                    "strip-ansi": "3.0.1"
                   }
                 }
               }
@@ -14605,7 +14882,7 @@
           "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
           "dev": true,
           "requires": {
-            "camelcase": "^4.1.0"
+            "camelcase": "4.1.0"
           },
           "dependencies": {
             "camelcase": {
@@ -14624,8 +14901,8 @@
       "integrity": "sha1-oQHrrlnWUHNU1x2AE5UKOot6WlQ=",
       "dev": true,
       "requires": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
+        "source-list-map": "2.0.0",
+        "source-map": "0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -14647,7 +14924,7 @@
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
       "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=",
       "requires": {
-        "isexe": "^2.0.0"
+        "isexe": "2.0.0"
       }
     },
     "which-module": {
@@ -14665,7 +14942,7 @@
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
       "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
       "requires": {
-        "string-width": "^1.0.2 || 2"
+        "string-width": "1.0.2"
       }
     },
     "window-size": {
@@ -14686,7 +14963,7 @@
       "integrity": "sha1-rsxAWXb6talVJhgIRvDboojzpKA=",
       "dev": true,
       "requires": {
-        "errno": "~0.1.7"
+        "errno": "0.1.7"
       }
     },
     "wrap-ansi": {
@@ -14694,8 +14971,8 @@
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
       "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
       "requires": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1"
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1"
       }
     },
     "wrappy": {
@@ -14709,7 +14986,7 @@
       "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
       "dev": true,
       "requires": {
-        "mkdirp": "^0.5.1"
+        "mkdirp": "0.5.1"
       }
     },
     "xtend": {
@@ -14718,7 +14995,7 @@
       "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
       "dev": true,
       "requires": {
-        "object-keys": "~0.4.0"
+        "object-keys": "0.4.0"
       }
     },
     "y18n": {
@@ -14737,19 +15014,19 @@
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
       "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
       "requires": {
-        "camelcase": "^3.0.0",
-        "cliui": "^3.2.0",
-        "decamelize": "^1.1.1",
-        "get-caller-file": "^1.0.1",
-        "os-locale": "^1.4.0",
-        "read-pkg-up": "^1.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^1.0.1",
-        "set-blocking": "^2.0.0",
-        "string-width": "^1.0.2",
-        "which-module": "^1.0.0",
-        "y18n": "^3.2.1",
-        "yargs-parser": "^5.0.0"
+        "camelcase": "3.0.0",
+        "cliui": "3.2.0",
+        "decamelize": "1.2.0",
+        "get-caller-file": "1.0.2",
+        "os-locale": "1.4.0",
+        "read-pkg-up": "1.0.1",
+        "require-directory": "2.1.1",
+        "require-main-filename": "1.0.1",
+        "set-blocking": "2.0.0",
+        "string-width": "1.0.2",
+        "which-module": "1.0.0",
+        "y18n": "3.2.1",
+        "yargs-parser": "5.0.0"
       },
       "dependencies": {
         "camelcase": {
@@ -14764,7 +15041,7 @@
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
       "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
       "requires": {
-        "camelcase": "^3.0.0"
+        "camelcase": "3.0.0"
       },
       "dependencies": {
         "camelcase": {
@@ -14780,7 +15057,56 @@
       "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
       "dev": true,
       "requires": {
-        "fd-slicer": "~1.0.1"
+        "fd-slicer": "1.0.1"
+      }
+    },
+    "zip-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-2.0.1.tgz",
+      "integrity": "sha512-c+eUhhkDpaK87G/py74wvWLtz2kzMPNCCkUApkun50ssE0oQliIQzWpTnwjB+MTKVIf2tGzIgHyqW/Y+W77ecQ==",
+      "dev": true,
+      "requires": {
+        "archiver-utils": "2.0.0",
+        "compress-commons": "1.2.2",
+        "readable-stream": "2.3.6"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        }
       }
     }
   }
diff --git a/package.json b/package.json
index 9b5bc6396..1539107a4 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,9 @@
     "vue-loader": "^13.7.2",
     "vue-material-design-icons": "^1.6.0",
     "vue-template-compiler": "^2.5.17",
-    "webpack": "^3.12.0"
+    "webpack": "^3.12.0",
+    "archiver": "^3.0.0",
+    "hash-files": "^1.1.1"  
   },
   "scripts": {
     "install": "node scripts/install.js",
@@ -88,6 +90,7 @@
     "package_release": "node scripts/package-release.js",
     "release": "npm run lint && npm run build_release && gulp release && npm run package_release",
     "update_release": "npm run build_release && gulp build-release",
+    "tt": "gulp tt",
     "inject": "node scripts/inject.js"
   }
 }
diff --git a/scripts/package-release.js b/scripts/package-release.js
index 443e3b2e2..4174b8206 100644
--- a/scripts/package-release.js
+++ b/scripts/package-release.js
@@ -1,65 +1,117 @@
 const fs = require('fs');
 const path = require('path');
 const archiver = require('archiver');
+const hashfiles = require('hash-files');
+
+const releaseStub = require('./releasestub.json');
 
-const releasepkg = require('../release/package.json');
 const mainpkg = require('../package.json');
-const corepkg = require('../core/package.json');
-const clientpkg = require('../client/package.json');
-const editorpkg = require('../csseditor/package.json');
-
-// core.zip
-const core = new Promise((resolve, reject) => {
-    const core_zip = archiver('zip');
-    core_zip.file('./release/package.json', {name: 'package.json'});
-    core_zip.file('./release/index.js', {name: 'index.js'});
-    core_zip.file(`./release/core.${corepkg.version}.js`, {name: `core.${corepkg.version}.js`});
-    core_zip.file('./release/sparkplug.js', {name: 'sparkplug.js'});
-    core_zip.directory('./release/modules', 'modules');
-    core_zip.directory('./release/node_modules', 'node_modules');
-
-    const core_zip_stream = fs.createWriteStream('./release/core.zip');
-    core_zip.pipe(core_zip_stream);
-
-    core_zip.on('end', resolve);
-    core_zip.on('error', reject);
-    core_zip.finalize();
-});
-
-// client.zip
-const client = new Promise((resolve, reject) => {
-    const client_zip = archiver('zip');
-    client_zip.file(`./release/client.${clientpkg.version}.js`, {name: `client.${clientpkg.version}.js`});
-
-    const client_zip_stream = fs.createWriteStream('./release/client.zip');
-    client_zip.pipe(client_zip_stream);
-
-    client_zip.on('end', resolve);
-    client_zip.on('error', reject);
-    client_zip.finalize();
-});
-
-// csseditor.zip
-const csseditor = new Promise((resolve, reject) => {
-    const csseditor_zip = archiver('zip');
-    csseditor_zip.directory('./release/csseditor', 'csseditor');
-
-    const csseditor_zip_stream = fs.createWriteStream('./release/csseditor.zip');
-    csseditor_zip.pipe(csseditor_zip_stream);
-
-    csseditor_zip.on('end', resolve);
-    csseditor_zip.on('error', reject);
-    csseditor_zip.finalize();
-});
-
-// full.zip
-Promise.all([core, client, csseditor]).then(() => {
-    const full_zip = archiver('zip');
-    full_zip.file('./release/core.zip', {name: 'core.zip'});
-    full_zip.file('./release/client.zip', {name: 'client.zip'});
-    full_zip.file('./release/csseditor.zip', {name: 'csseditor.zip'});
-
-    const full_zip_stream = fs.createWriteStream('./release/full.zip');
-    full_zip.pipe(full_zip_stream);
-    full_zip.finalize();
-});
+const corepkg = require('../release/core/package.json');
+const clientpkg = require('../release/client/package.json');
+// const editorpkg = require('../release/editor/package.json');
+
+const createArchiver = (level = 1) => {
+    return archiver('tar', {
+        gzip: true,
+        gzipOptions: {
+            level
+        }
+    });
+};
+
+async function hashFile(fn) {
+    return new Promise((resolve, reject) => {
+        hashfiles({ files: [fn], algorithm: 'sha256' }, (error, hash) => {
+            if (error) return reject();
+            resolve(hash);
+        });
+    });
+}
+
+async function fileSize(fn) {
+    return new Promise((resolve, reject) => {
+        fs.stat(fn, (err, stats) => {
+            if (err) return reject();
+            resolve(stats['size']);
+        });
+    });
+}
+
+// Core
+async function archiveCore(out = './release/core.tar.gz') {
+    return new Promise((resolve, reject) => {
+        console.log('packaging core');
+        const mainFn = `core.${corepkg.version}.js`;
+        const coreArchive = createArchiver();
+        coreArchive.file('./release/core/package.json', { name: 'package.json' });
+        coreArchive.file('./release/core/index.js', { name: 'index.js' });
+        coreArchive.file(`./release/core/${mainFn}`, { name: `${mainFn}` });
+        coreArchive.file('./release/core/sparkplug.js', { name: 'sparkplug.js' });
+        coreArchive.directory('./release/core/modules', 'modules');
+        coreArchive.directory('./release/core/node_modules', 'node_modules');
+
+        const coreZipStream = fs.createWriteStream(out);
+        coreArchive.pipe(coreZipStream);
+
+        coreArchive.on('end', () => resolve(out));
+        coreArchive.on('error', reject);
+        coreArchive.finalize();
+    });
+}
+
+// Client
+async function archiveClient(out = './release/client.tar.gz') {
+    return new Promise((resolve, reject) => {
+        console.log('packaging client');
+        const mainFn = `client.${clientpkg.version}.js`;
+        const clientArchive = createArchiver();
+        clientArchive.file('./release/client/package.json', { name: 'package.json' });
+        clientArchive.file('./release/core/sparkplug.js', { name: 'sparkplug.js' });
+        clientArchive.file(`./release/client/${mainFn}`, { name: `${mainFn}` });
+
+        const clientZipStream = fs.createWriteStream(out);
+        clientArchive.pipe(clientZipStream);
+
+        clientArchive.on('end', () => resolve(out));
+        clientArchive.on('error', reject);
+        clientArchive.finalize();
+    });
+}
+
+async function pack() {
+    const coreArchive = await archiveCore();
+    const coreHash = await hashFile(coreArchive);
+    const coreSize = await fileSize(coreArchive);
+    console.log(`${coreArchive} ${coreSize} | ${coreHash}`);
+
+    const coreStub = releaseStub.files.find(f => f.id === 'core');
+    coreStub.name = 'core.tar.gz';
+    coreStub.version = corepkg.version;
+    coreStub.hash = coreHash;
+    coreStub.size = coreSize;
+    coreStub.remote = coreStub.remote.replace(':fn', 'core.tar.gz');
+
+    const clientArchive = await archiveClient();
+    const clientHash = await hashFile(clientArchive);
+    const clientSize = await fileSize(clientArchive);
+    console.log(`${clientArchive} ${clientSize} | ${clientHash}`);
+
+    const clientStub = releaseStub.files.find(f => f.id === 'client');
+    clientStub.name = 'client.tar.gz';
+    clientStub.version = clientpkg.version;
+    clientStub.hash = clientHash;
+    clientStub.size = clientSize;
+    clientStub.remote = clientStub.remote.replace(':fn', 'client.tar.gz');
+
+    releaseStub.mver = mainpkg.version;
+    releaseStub.files = [
+        coreStub,
+        clientStub
+    ];
+
+    fs.writeFile('./release/releaseinfo.json', JSON.stringify(releaseStub, null, 4), (err) => {
+        console.log(`all done! Don't forget to update :rel`);
+    });
+}
+
+pack();
diff --git a/scripts/package-release.js.old b/scripts/package-release.js.old
new file mode 100644
index 000000000..443e3b2e2
--- /dev/null
+++ b/scripts/package-release.js.old
@@ -0,0 +1,65 @@
+const fs = require('fs');
+const path = require('path');
+const archiver = require('archiver');
+
+const releasepkg = require('../release/package.json');
+const mainpkg = require('../package.json');
+const corepkg = require('../core/package.json');
+const clientpkg = require('../client/package.json');
+const editorpkg = require('../csseditor/package.json');
+
+// core.zip
+const core = new Promise((resolve, reject) => {
+    const core_zip = archiver('zip');
+    core_zip.file('./release/package.json', {name: 'package.json'});
+    core_zip.file('./release/index.js', {name: 'index.js'});
+    core_zip.file(`./release/core.${corepkg.version}.js`, {name: `core.${corepkg.version}.js`});
+    core_zip.file('./release/sparkplug.js', {name: 'sparkplug.js'});
+    core_zip.directory('./release/modules', 'modules');
+    core_zip.directory('./release/node_modules', 'node_modules');
+
+    const core_zip_stream = fs.createWriteStream('./release/core.zip');
+    core_zip.pipe(core_zip_stream);
+
+    core_zip.on('end', resolve);
+    core_zip.on('error', reject);
+    core_zip.finalize();
+});
+
+// client.zip
+const client = new Promise((resolve, reject) => {
+    const client_zip = archiver('zip');
+    client_zip.file(`./release/client.${clientpkg.version}.js`, {name: `client.${clientpkg.version}.js`});
+
+    const client_zip_stream = fs.createWriteStream('./release/client.zip');
+    client_zip.pipe(client_zip_stream);
+
+    client_zip.on('end', resolve);
+    client_zip.on('error', reject);
+    client_zip.finalize();
+});
+
+// csseditor.zip
+const csseditor = new Promise((resolve, reject) => {
+    const csseditor_zip = archiver('zip');
+    csseditor_zip.directory('./release/csseditor', 'csseditor');
+
+    const csseditor_zip_stream = fs.createWriteStream('./release/csseditor.zip');
+    csseditor_zip.pipe(csseditor_zip_stream);
+
+    csseditor_zip.on('end', resolve);
+    csseditor_zip.on('error', reject);
+    csseditor_zip.finalize();
+});
+
+// full.zip
+Promise.all([core, client, csseditor]).then(() => {
+    const full_zip = archiver('zip');
+    full_zip.file('./release/core.zip', {name: 'core.zip'});
+    full_zip.file('./release/client.zip', {name: 'client.zip'});
+    full_zip.file('./release/csseditor.zip', {name: 'csseditor.zip'});
+
+    const full_zip_stream = fs.createWriteStream('./release/full.zip');
+    full_zip.pipe(full_zip_stream);
+    full_zip.finalize();
+});
diff --git a/scripts/releasestub.json b/scripts/releasestub.json
new file mode 100644
index 000000000..1e5c28f04
--- /dev/null
+++ b/scripts/releasestub.json
@@ -0,0 +1,30 @@
+{
+    "mver": "",
+    "stub": "/master/installer/stub.js",
+    "files": [
+        {
+            "id": "client",
+            "name": "",
+            "version": "",
+            "size": "",
+            "remote": "/releases/download/:rel/:fn",
+            "hash": ""
+        },
+        {
+            "id": "core",
+            "name": "",
+            "version": "",
+            "size": "",
+            "remote": "/releases/download/:rel/:fn",
+            "hash": ""
+        },
+        {
+            "id": "editor",
+            "name": "",
+            "version": "",
+            "size": "210481",
+            "remote": "/releases/download/:rel/:fn",
+            "hash": ""
+        }
+    ]
+}

From 111be57b599efad45304ad768b4f8d6ec4f89b0e Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 18 Feb 2019 11:42:34 +0200
Subject: [PATCH 09/69] release task

---
 gulpfile.babel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 111d5311c..a19eb3957 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -126,4 +126,4 @@ gulp.task('del-release', function() {
 
 gulp.task('dependencies', gulp.series('node-modules', gulp.parallel('node-sass-bindings', 'keytar-bindings')));
 gulp.task('build-release', gulp.parallel('core-release', 'client-release', 'dependencies'));
-gulp.task('tt', gulp.series('del-release', gulp.parallel('build-release')));
+gulp.task('release', gulp.series('del-release', 'build-release'));

From b5e8098d204d6b0cf7bf46f2c28393d285b7f81f Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 18 Feb 2019 12:03:54 +0200
Subject: [PATCH 10/69] Not having asar in externals causes some weird error

---
 client/webpack.production.config.js |  1 +
 package-lock.json                   | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/client/webpack.production.config.js b/client/webpack.production.config.js
index 7ca272d72..8af886e0f 100644
--- a/client/webpack.production.config.js
+++ b/client/webpack.production.config.js
@@ -33,6 +33,7 @@ module.exports = {
     },
     externals: {
         electron: 'require("electron")',
+        asar: 'require("asar")',
         fs: 'require("fs")',
         path: 'require("path")',
         util: 'require("util")',
diff --git a/package-lock.json b/package-lock.json
index de041d314..7c8f12da8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2039,6 +2039,11 @@
       "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
       "dev": true
     },
+    "child_process": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/child_process/-/child_process-1.0.2.tgz",
+      "integrity": "sha1-sffn/HPSXn/R1FWtyU4UODAYK1o="
+    },
     "chokidar": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.2.tgz",
@@ -2828,9 +2833,6 @@
         "randomfill": "1.0.4"
       }
     },
-    "csp-parse": {
-      "version": "github:macropodhq/csp-parse#db7d5f954b420b527d7fb452a93bb6e2fa302c5a"
-    },
     "css-color-names": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
@@ -9899,6 +9901,11 @@
         }
       }
     },
+    "original-fs": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/original-fs/-/original-fs-1.0.0.tgz",
+      "integrity": "sha512-X/sHggGgmoyG3plMSAZcyehbBNnADefp2uN+ahSP2OV+HjCCS4p997yDL0kC5YSHPIp9eTEfezWulEQgvx1TIQ=="
+    },
     "os-browserify": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",

From 0311602539a012bf40a40dbac679f941f36f5fd2 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 18 Feb 2019 12:13:51 +0200
Subject: [PATCH 11/69] update scripts

---
 package-lock.json | 149 ++++++++++++++++++++++++++++++++++++++++++----
 package.json      |  12 ++--
 2 files changed, 145 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7c8f12da8..c7bdb5d00 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2039,11 +2039,6 @@
       "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
       "dev": true
     },
-    "child_process": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/child_process/-/child_process-1.0.2.tgz",
-      "integrity": "sha1-sffn/HPSXn/R1FWtyU4UODAYK1o="
-    },
     "chokidar": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.2.tgz",
@@ -2833,6 +2828,9 @@
         "randomfill": "1.0.4"
       }
     },
+    "csp-parse": {
+      "version": "github:macropodhq/csp-parse#db7d5f954b420b527d7fb452a93bb6e2fa302c5a"
+    },
     "css-color-names": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
@@ -5826,6 +5824,33 @@
         "path-is-absolute": "1.0.1"
       }
     },
+    "glob-all": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-all/-/glob-all-3.1.0.tgz",
+      "integrity": "sha1-iRPd+17hrHgSZWJBsD1SF8ZLAqs=",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2",
+        "yargs": "1.2.6"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.1.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz",
+          "integrity": "sha1-md9lelJXTCHJBXSX33QnkLK0wN4=",
+          "dev": true
+        },
+        "yargs": {
+          "version": "1.2.6",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.2.6.tgz",
+          "integrity": "sha1-nHtKgv1dWVsr8Xq23MQxNUMv40s=",
+          "dev": true,
+          "requires": {
+            "minimist": "0.1.0"
+          }
+        }
+      }
+    },
     "glob-base": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
@@ -7013,6 +7038,33 @@
         "safe-buffer": "5.1.1"
       }
     },
+    "hash-files": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/hash-files/-/hash-files-1.1.1.tgz",
+      "integrity": "sha1-X4nGTvIezmnIJhJUt2Wb1A6R2N4=",
+      "dev": true,
+      "requires": {
+        "async": "1.5.2",
+        "glob-all": "3.1.0",
+        "opter": "1.1.0",
+        "read-files": "0.1.0",
+        "underscore": "1.9.1"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        },
+        "underscore": {
+          "version": "1.9.1",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
+          "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==",
+          "dev": true
+        }
+      }
+    },
     "hash-sum": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
@@ -8243,6 +8295,12 @@
       "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
       "dev": true
     },
+    "lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+      "dev": true
+    },
     "lodash.isarguments": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
@@ -8255,6 +8313,12 @@
       "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
       "dev": true
     },
+    "lodash.isequal": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
+      "dev": true
+    },
     "lodash.isplainobject": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
@@ -9642,6 +9706,12 @@
       "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
       "dev": true
     },
+    "object-path": {
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz",
+      "integrity": "sha1-NwrnUvvzfePqcKhhwju6iRVpGUk=",
+      "dev": true
+    },
     "object-visit": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
@@ -9760,6 +9830,20 @@
         "mimic-fn": "1.2.0"
       }
     },
+    "opter": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/opter/-/opter-1.1.0.tgz",
+      "integrity": "sha1-JZiuu2Cz8acyKvEJcIb055jISnY=",
+      "dev": true,
+      "requires": {
+        "commander": "2.16.0",
+        "js-yaml": "3.7.0",
+        "object-path": "0.11.4",
+        "underscore": "1.4.4",
+        "z-schema": "3.25.1",
+        "z-schema-errors": "0.0.1"
+      }
+    },
     "optionator": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
@@ -9901,11 +9985,6 @@
         }
       }
     },
-    "original-fs": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/original-fs/-/original-fs-1.0.0.tgz",
-      "integrity": "sha512-X/sHggGgmoyG3plMSAZcyehbBNnADefp2uN+ahSP2OV+HjCCS4p997yDL0kC5YSHPIp9eTEfezWulEQgvx1TIQ=="
-    },
     "os-browserify": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
@@ -11249,6 +11328,12 @@
         }
       }
     },
+    "read-files": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/read-files/-/read-files-0.1.0.tgz",
+      "integrity": "sha1-YGu3oBd5Utai+YPVmAlglDFNMh4=",
+      "dev": true
+    },
     "read-pkg": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
@@ -14144,6 +14229,12 @@
         "spdx-expression-parse": "1.0.4"
       }
     },
+    "validator": {
+      "version": "10.11.0",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz",
+      "integrity": "sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==",
+      "dev": true
+    },
     "value-or-function": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
@@ -15067,6 +15158,44 @@
         "fd-slicer": "1.0.1"
       }
     },
+    "z-schema": {
+      "version": "3.25.1",
+      "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-3.25.1.tgz",
+      "integrity": "sha512-7tDlwhrBG+oYFdXNOjILSurpfQyuVgkRe3hB2q8TEssamDHB7BbLWYkYO98nTn0FibfdFroFKDjndbgufAgS/Q==",
+      "dev": true,
+      "requires": {
+        "commander": "2.16.0",
+        "core-js": "2.6.5",
+        "lodash.get": "4.4.2",
+        "lodash.isequal": "4.5.0",
+        "validator": "10.11.0"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "2.6.5",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
+          "integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==",
+          "dev": true
+        }
+      }
+    },
+    "z-schema-errors": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/z-schema-errors/-/z-schema-errors-0.0.1.tgz",
+      "integrity": "sha1-4GJwpMpDklcp8ldkeJyp9Gv/D30=",
+      "dev": true,
+      "requires": {
+        "xtend": "4.0.1"
+      },
+      "dependencies": {
+        "xtend": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+          "dev": true
+        }
+      }
+    },
     "zip-stream": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-2.0.1.tgz",
diff --git a/package.json b/package.json
index 1539107a4..53acb22f8 100644
--- a/package.json
+++ b/package.json
@@ -16,16 +16,17 @@
   },
   "private": false,
   "dependencies": {
+    "asar": "^0.14.3",
     "csp-parse": "github:macropodhq/csp-parse",
     "deepmerge": "^2.2.1",
     "fs-extra": "^7.0.0",
     "keytar": "^4.3.0",
     "nedb": "^1.8.0",
-    "node-sass": "^4.10.0",
-    "asar": "^0.14.3"
+    "node-sass": "^4.10.0"
   },
   "devDependencies": {
     "aes256": "^1.0.4",
+    "archiver": "^3.0.0",
     "babel-core": "^6.26.3",
     "babel-loader": "^7.1.5",
     "babel-preset-env": "^1.7.0",
@@ -50,6 +51,7 @@
     "gulp-npm-copy-deps": "^1.0.2",
     "gulp-rename": "^1.4.0",
     "gulp-watch": "^5.0.1",
+    "hash-files": "^1.1.1",
     "html-webpack-plugin": "^3.2.0",
     "jquery": "^3.2.1",
     "lodash": "^4.17.11",
@@ -68,9 +70,7 @@
     "vue-loader": "^13.7.2",
     "vue-material-design-icons": "^1.6.0",
     "vue-template-compiler": "^2.5.17",
-    "webpack": "^3.12.0",
-    "archiver": "^3.0.0",
-    "hash-files": "^1.1.1"  
+    "webpack": "^3.12.0"
   },
   "scripts": {
     "install": "node scripts/install.js",
@@ -88,9 +88,9 @@
     "build_node-sass": "node scripts/build-node-sass.js",
     "build_release": "npm run release --prefix client && npm run build --prefix core && npm run release --prefix csseditor",
     "package_release": "node scripts/package-release.js",
+    "gulp_release": "gulp release",
     "release": "npm run lint && npm run build_release && gulp release && npm run package_release",
     "update_release": "npm run build_release && gulp build-release",
-    "tt": "gulp tt",
     "inject": "node scripts/inject.js"
   }
 }

From 6c8631f1cd7078d1209ab5e0b909c54e3aba95bd Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 18 Feb 2019 12:14:38 +0200
Subject: [PATCH 12/69] TODO editor packaging/renaming

---
 scripts/releasestub.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/releasestub.json b/scripts/releasestub.json
index 1e5c28f04..134d32e45 100644
--- a/scripts/releasestub.json
+++ b/scripts/releasestub.json
@@ -22,7 +22,7 @@
             "id": "editor",
             "name": "",
             "version": "",
-            "size": "210481",
+            "size": "",
             "remote": "/releases/download/:rel/:fn",
             "hash": ""
         }

From 75439a600ecef16576c4e3203af2683fb4b4e251 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 18 Feb 2019 14:54:27 +0200
Subject: [PATCH 13/69] stub should be a file

---
 scripts/releasestub.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/scripts/releasestub.json b/scripts/releasestub.json
index 134d32e45..18285885f 100644
--- a/scripts/releasestub.json
+++ b/scripts/releasestub.json
@@ -1,7 +1,14 @@
 {
     "mver": "",
-    "stub": "/master/installer/stub.js",
     "files": [
+        {
+            "id": "stub",
+            "name": "stub.js",
+            "version": "1.0.0",
+            "size": 0,
+            "remote": "/master/installer/stub.js",
+            "hash": ""
+        },
         {
             "id": "client",
             "name": "",

From 90f5596cb2082aa46193b8f4c12fc52448006af2 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 18 Feb 2019 14:57:00 +0200
Subject: [PATCH 14/69] files should be under respective dir

---
 scripts/package-release.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/package-release.js b/scripts/package-release.js
index 4174b8206..31e690f18 100644
--- a/scripts/package-release.js
+++ b/scripts/package-release.js
@@ -43,12 +43,12 @@ async function archiveCore(out = './release/core.tar.gz') {
         console.log('packaging core');
         const mainFn = `core.${corepkg.version}.js`;
         const coreArchive = createArchiver();
-        coreArchive.file('./release/core/package.json', { name: 'package.json' });
-        coreArchive.file('./release/core/index.js', { name: 'index.js' });
-        coreArchive.file(`./release/core/${mainFn}`, { name: `${mainFn}` });
-        coreArchive.file('./release/core/sparkplug.js', { name: 'sparkplug.js' });
-        coreArchive.directory('./release/core/modules', 'modules');
-        coreArchive.directory('./release/core/node_modules', 'node_modules');
+        coreArchive.file('./release/core/package.json', { name: 'core/package.json' });
+        coreArchive.file('./release/core/index.js', { name: 'core/index.js' });
+        coreArchive.file(`./release/core/${mainFn}`, { name: `core/${mainFn}` });
+        coreArchive.file('./release/core/sparkplug.js', { name: 'core/sparkplug.js' });
+        coreArchive.directory('./release/core/modules', 'core/modules');
+        coreArchive.directory('./release/core/node_modules', 'core/node_modules');
 
         const coreZipStream = fs.createWriteStream(out);
         coreArchive.pipe(coreZipStream);
@@ -65,9 +65,9 @@ async function archiveClient(out = './release/client.tar.gz') {
         console.log('packaging client');
         const mainFn = `client.${clientpkg.version}.js`;
         const clientArchive = createArchiver();
-        clientArchive.file('./release/client/package.json', { name: 'package.json' });
-        clientArchive.file('./release/core/sparkplug.js', { name: 'sparkplug.js' });
-        clientArchive.file(`./release/client/${mainFn}`, { name: `${mainFn}` });
+        clientArchive.file('./release/client/package.json', { name: 'client/package.json' });
+        clientArchive.file('./release/core/sparkplug.js', { name: 'client/sparkplug.js' });
+        clientArchive.file(`./release/client/${mainFn}`, { name: `client/${mainFn}` });
 
         const clientZipStream = fs.createWriteStream(out);
         clientArchive.pipe(clientZipStream);

From 3a370f2827cca128ae907a614728ba68823224f6 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 18 Feb 2019 15:01:30 +0200
Subject: [PATCH 15/69] higher compression for core

---
 scripts/package-release.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/package-release.js b/scripts/package-release.js
index 31e690f18..0a74a192e 100644
--- a/scripts/package-release.js
+++ b/scripts/package-release.js
@@ -42,7 +42,7 @@ async function archiveCore(out = './release/core.tar.gz') {
     return new Promise((resolve, reject) => {
         console.log('packaging core');
         const mainFn = `core.${corepkg.version}.js`;
-        const coreArchive = createArchiver();
+        const coreArchive = createArchiver(6);
         coreArchive.file('./release/core/package.json', { name: 'core/package.json' });
         coreArchive.file('./release/core/index.js', { name: 'core/index.js' });
         coreArchive.file(`./release/core/${mainFn}`, { name: `core/${mainFn}` });

From f511e4556e51333a37e495203c084d63ff0b3870 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 18 Feb 2019 15:20:44 +0200
Subject: [PATCH 16/69] keep stub

---
 scripts/package-release.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/package-release.js b/scripts/package-release.js
index 0a74a192e..c69424228 100644
--- a/scripts/package-release.js
+++ b/scripts/package-release.js
@@ -105,6 +105,7 @@ async function pack() {
 
     releaseStub.mver = mainpkg.version;
     releaseStub.files = [
+        releaseStub.files.find(f => f.id === 'stub'),
         coreStub,
         clientStub
     ];

From 6ca36ebbb5b6546e5e1ea3384455d713e2b00187 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 18 Feb 2019 15:21:51 +0200
Subject: [PATCH 17/69] Should use core package

---
 gulpfile.babel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index a19eb3957..78ad58dc1 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -24,7 +24,7 @@ gulp.task('core-main', function () {
 
 gulp.task('core-pkg', function() {
     return pump([
-        gulp.src('package.json'),
+        gulp.src('core/package.json'),
         editjson(function(pkg) {
             pkg.main = `core.${corepkg.version}.js`;
             delete pkg.devDependencies;

From 7bc4b652fa59fc827751eb6d70d0a35a5dc89f44 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Wed, 20 Feb 2019 16:03:03 +0200
Subject: [PATCH 18/69] add child process as external instead of asar

---
 client/webpack.production.config.js |  4 ++--
 package-lock.json                   | 22 ++++++++++++----------
 package.json                        |  8 +++++---
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/client/webpack.production.config.js b/client/webpack.production.config.js
index 8af886e0f..ea7c6bd70 100644
--- a/client/webpack.production.config.js
+++ b/client/webpack.production.config.js
@@ -33,7 +33,6 @@ module.exports = {
     },
     externals: {
         electron: 'require("electron")',
-        asar: 'require("asar")',
         fs: 'require("fs")',
         path: 'require("path")',
         util: 'require("util")',
@@ -41,7 +40,8 @@ module.exports = {
         net: 'require("net")',
         request: 'require(require("path").join(require("electron").remote.app.getAppPath(), "node_modules", "request"))',
         sparkplug: 'require("./sparkplug")',
-        'node-crypto': 'require("crypto")'
+        'node-crypto': 'require("crypto")',
+        'child_process': 'require("child_process")'
     },
     resolve: {
         alias: {
diff --git a/package-lock.json b/package-lock.json
index c7bdb5d00..55e4a8dde 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -600,9 +600,9 @@
       "dev": true
     },
     "asar": {
-      "version": "0.14.3",
-      "resolved": "https://registry.npmjs.org/asar/-/asar-0.14.3.tgz",
-      "integrity": "sha512-+hNnVVDmYbv05We/a9knj/98w171+A94A9DNHj+3kXUr3ENTQoSEcfbJRvBBRHyOh4vukBYWujmHvvaMmQoQbg==",
+      "version": "0.14.6",
+      "resolved": "https://registry.npmjs.org/asar/-/asar-0.14.6.tgz",
+      "integrity": "sha512-ZqybKcdO5At6y3ge2RHxVImc6Eltb2t3sxT7lk4T4zjZBSFUuIGCIZY6f41dCjlvJSizN5QPRr8YTgMhpgBjLg==",
       "requires": {
         "chromium-pickle-js": "0.2.0",
         "commander": "2.16.0",
@@ -610,7 +610,7 @@
         "glob": "6.0.4",
         "minimatch": "3.0.4",
         "mkdirp": "0.5.1",
-        "mksnapshot": "0.3.1",
+        "mksnapshot": "0.3.4",
         "tmp": "0.0.28"
       },
       "dependencies": {
@@ -2828,9 +2828,6 @@
         "randomfill": "1.0.4"
       }
     },
-    "csp-parse": {
-      "version": "github:macropodhq/csp-parse#db7d5f954b420b527d7fb452a93bb6e2fa302c5a"
-    },
     "css-color-names": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
@@ -8890,9 +8887,9 @@
       "integrity": "sha1-dVSm+Nhxg0zJe1RisSLEwSTW3pE="
     },
     "mksnapshot": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.1.tgz",
-      "integrity": "sha1-JQHAVldDbXQs6Vik/5LHfkDdN+Y=",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.4.tgz",
+      "integrity": "sha512-FgUTiWiY+35LgL95P/MDYrBuQO5o0s3MmaWKX6ZJWoX4vMOY9vPsAv763l1OSSelL9jPsBQ/wf4bzfqTLNPSFg==",
       "requires": {
         "decompress-zip": "0.3.0",
         "fs-extra": "0.26.7",
@@ -9985,6 +9982,11 @@
         }
       }
     },
+    "original-fs": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/original-fs/-/original-fs-1.0.0.tgz",
+      "integrity": "sha512-X/sHggGgmoyG3plMSAZcyehbBNnADefp2uN+ahSP2OV+HjCCS4p997yDL0kC5YSHPIp9eTEfezWulEQgvx1TIQ=="
+    },
     "os-browserify": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
diff --git a/package.json b/package.json
index 53acb22f8..abfa9633b 100644
--- a/package.json
+++ b/package.json
@@ -16,13 +16,14 @@
   },
   "private": false,
   "dependencies": {
-    "asar": "^0.14.3",
+    "asar": "^0.14.6",
     "csp-parse": "github:macropodhq/csp-parse",
     "deepmerge": "^2.2.1",
     "fs-extra": "^7.0.0",
     "keytar": "^4.3.0",
     "nedb": "^1.8.0",
-    "node-sass": "^4.10.0"
+    "node-sass": "^4.10.0",
+    "original-fs": "^1.0.0"
   },
   "devDependencies": {
     "aes256": "^1.0.4",
@@ -91,6 +92,7 @@
     "gulp_release": "gulp release",
     "release": "npm run lint && npm run build_release && gulp release && npm run package_release",
     "update_release": "npm run build_release && gulp build-release",
-    "inject": "node scripts/inject.js"
+    "inject": "node scripts/inject.js",
+    "tt": "npm run release --prefix client"
   }
 }

From e6c9bc447ee58dcbcee03db23f11a60fb6de18dd Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Wed, 20 Feb 2019 16:10:18 +0200
Subject: [PATCH 19/69] allow tag to be set with args

---
 scripts/package-release.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/package-release.js b/scripts/package-release.js
index c69424228..fabcb5a4b 100644
--- a/scripts/package-release.js
+++ b/scripts/package-release.js
@@ -1,3 +1,5 @@
+const args = process.argv;
+const tag = args.length > 2 ? args[2] : ':rel';
 const fs = require('fs');
 const path = require('path');
 const archiver = require('archiver');
@@ -5,6 +7,11 @@ const hashfiles = require('hash-files');
 
 const releaseStub = require('./releasestub.json');
 
+releaseStub.files = releaseStub.files.map(file => {
+    file.remote = file.remote.replace(':rel', tag);
+    return file;
+});
+
 const mainpkg = require('../package.json');
 const corepkg = require('../release/core/package.json');
 const clientpkg = require('../release/client/package.json');

From 124ec078aac4603587638480c50a0afa731136ed Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Wed, 20 Feb 2019 16:12:56 +0200
Subject: [PATCH 20/69] only warn if tag is not set

---
 scripts/package-release.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/package-release.js b/scripts/package-release.js
index fabcb5a4b..c4e7c033b 100644
--- a/scripts/package-release.js
+++ b/scripts/package-release.js
@@ -118,7 +118,7 @@ async function pack() {
     ];
 
     fs.writeFile('./release/releaseinfo.json', JSON.stringify(releaseStub, null, 4), (err) => {
-        console.log(`all done! Don't forget to update :rel`);
+        console.log(`all done! ${tag === ':rel' ? `Don't forget to update :rel` : ''}`);
     });
 }
 

From 23d4eb77b2217aa9325a29a09518cc40fb95e313 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Wed, 20 Feb 2019 20:13:27 +0200
Subject: [PATCH 21/69] Fix test mode

---
 client/webpack.config.js |  2 +-
 core/src/main.js         | 23 +++++++++++++++++++++--
 package-lock.json        |  3 +++
 package.json             |  2 +-
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/client/webpack.config.js b/client/webpack.config.js
index 22a09c73d..8f856b639 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -39,7 +39,7 @@ module.exports = {
         process: 'require("process")',
         net: 'require("net")',
         request: 'require(require("path").join(require("electron").remote.app.getAppPath(), "node_modules", "request"))',
-        sparkplug: 'require("../core/sparkplug")',
+        sparkplug: 'require("../../core/dist/sparkplug")',
         'node-crypto': 'require("crypto")'
     },
     resolve: {
diff --git a/core/src/main.js b/core/src/main.js
index 853cbecb4..294944341 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -8,7 +8,23 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-const tests = typeof PRODUCTION === 'undefined';
+const TESTS = typeof PRODUCTION === 'undefined';
+const TEST_ARGS = () => {
+    const _basePath = path.resolve(__dirname, '..', '..');
+    const _baseDataPath =  path.resolve(_basePath, 'tests');
+    return {
+        'options': {
+            'autoInject': true,
+            'commonCore': true,
+            'commonData': true
+        },
+        'paths': {
+            'client': path.resolve(_basePath, 'client', 'dist'),
+            'core': path.resolve(_basePath, 'core', 'dist'),
+            'data': path.resolve(_baseDataPath, 'data')
+        }
+    }
+}
 
 import path from 'path';
 import sass from 'node-sass';
@@ -135,6 +151,7 @@ export class BetterDiscord {
     get window() {  return this.windowUtils ? this.windowUtils.window : undefined; }
 
     constructor(args) {
+        if (TESTS) args = TEST_ARGS();
         console.log('[BetterDiscord|args] ', JSON.stringify(args, null, 4));
         if (BetterDiscord.loaded) {
             console.log('[BetterDiscord] Creating two BetterDiscord objects???');
@@ -216,7 +233,9 @@ export class BetterDiscord {
      */
     parseClientPackage() {
         const clientPath = this.config.getPath('client');
-        const { version, main } = require(`${clientPath}/package.json`);
+        const clientPkg = TESTS ? require(`${path.resolve(clientPath, '..')}/package.json`) :require(`${clientPath}/package.json`);
+        const { version } = clientPkg;
+        const main = TESTS ? 'betterdiscord.client.js' : clientPkg.main;
         this.config.addPath('client_script', `${clientPath}/${main}`);
         this.config.setClientVersion(version);
         console.log(`[BetterDiscord] Client v${this.config.clientVersion} - ${this.config.getPath('client_script')}`);
diff --git a/package-lock.json b/package-lock.json
index 55e4a8dde..1a7707419 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2828,6 +2828,9 @@
         "randomfill": "1.0.4"
       }
     },
+    "csp-parse": {
+      "version": "github:macropodhq/csp-parse#db7d5f954b420b527d7fb452a93bb6e2fa302c5a"
+    },
     "css-color-names": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
diff --git a/package.json b/package.json
index abfa9633b..e51201f7d 100644
--- a/package.json
+++ b/package.json
@@ -93,6 +93,6 @@
     "release": "npm run lint && npm run build_release && gulp release && npm run package_release",
     "update_release": "npm run build_release && gulp build-release",
     "inject": "node scripts/inject.js",
-    "tt": "npm run release --prefix client"
+    "tt": "npm run build --prefix core"
   }
 }

From 99614aecdc0d9fdc798155a36f85b4a964161b8a Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 11:56:07 +0200
Subject: [PATCH 22/69] Fix linter warnings

---
 .../styles/partials/bdsettings/button.scss    | 241 ++++++------
 .../partials/bdsettings/sidebarview.scss      | 350 +++++++++---------
 .../src/styles/partials/generic/drawers.scss  |  14 +-
 .../partials/generic/forms/switches.scss      |   2 +-
 .../styles/partials/sidebarview/sidebar.scss  |  91 ++---
 5 files changed, 352 insertions(+), 346 deletions(-)

diff --git a/client/src/styles/partials/bdsettings/button.scss b/client/src/styles/partials/bdsettings/button.scss
index 14b72dde8..78419865d 100644
--- a/client/src/styles/partials/bdsettings/button.scss
+++ b/client/src/styles/partials/bdsettings/button.scss
@@ -1,122 +1,125 @@
 .bd-settingsButton {
-	position: absolute;
-	z-index: 1;
-	top: 22px;
-	width: 70px;
-	height: 48px;
-	left: 0;
-	box-shadow: 0 1px 0 rgba(0, 0, 0, .2), 0 2px 0 rgba(0, 0, 0, .06);
-	opacity: 1;
-
-	.platform-darwin & { // sass-lint:disable-line class-name-format
-		top: 27px;
-	}
-
-	.platform-linux & { // sass-lint:disable-line class-name-format
-		top: 0;
-	}
-
-	.bd-settingsButtonBtn {
-		backface-visibility: hidden;
-		-webkit-backface-visibility: hidden;
-		width: 70px;
+    position: absolute;
+    z-index: 1;
+    top: 22px;
+    width: 70px;
     height: 48px;
-		cursor: pointer;
-		filter: grayscale(100%);
-		opacity: .5;
-		position: relative;
-		transition: all .3s cubic-bezier(.4,0,0,1);
-
-		&::before,
-		&::after {
-			content:"";
-			display: block;
-			position: absolute;
-			top:0;
-			left:0;
-			background-repeat: no-repeat;
-			background-position: center;
-		}
-
-		&::before {
-			width: 70px;
-    	height: 48px;
-			background-image: $logoSmallBw;
-			background-size: 50% 50%;
-			opacity: 1;
-			transition:all .3s cubic-bezier(.4,0,0,1), opacity .01s;
-		}
-		&::after {
-			width: 130px;
-			height: 43px;
-			background-image: $logoBigBw;
-			background-size: 100% 100%;
-			transform:translate(-7px,2px)scale(0.5);
-			opacity: 0;
-			transition:all .3s cubic-bezier(.4,0,0,1);
-		}
-
-		&:not(.bd-loading) {
-			&:hover {
-				filter: none;
-				opacity: 1;
-			}
-		}
-
-		&.bd-loading {
-			animation: bd-settingsButtonPulse 1.5s infinite;
-		}
-
-		&.bd-updates {
-			filter: hue-rotate(250deg) !important; // sass-lint:disable-line no-important
-			opacity: 1 !important; // sass-lint:disable-line no-important
-		}
-	}
-
-	&.bd-hideButton {
-		animation: bd-fadeOut .4s ease-out;
-
-		&.bd-active {
-			animation: bd-fadeIn .4s ease-in;
-		}
-
-		&:not(.bd-active) {
-			&:not(.bd-animating) {
-				display: none;
-			}
-		}
-	}
-
-	&.bd-active {
-		opacity: 1;
-	}
-
-	&.bd-active,
-	&.bd-hideButton {
-		background: transparent;
-		box-shadow: none;
-
-		.bd-settingsButtonBtn {
-			filter: none;
-			opacity: 1;
-			width: 130px;
-			height: 43px;
-			transform:translate(25px,18px);
-			cursor: default;
-			&::before{
-				opacity:0;
-				transform:translate(-16px,-3px)scale(1.9);
-				transition:all .3s cubic-bezier(.4,0,0,1), opacity .1s .3s;
-			}
-			&::after{
-				opacity: 1;
-				transform:scale(1);
-			}
-		}
-	}
-
-	&.bd-active,
-	&.bd-animating {
-		z-index: 3001;
-	}
+    left: 0;
+    box-shadow: 0 1px 0 rgba(0, 0, 0, .2), 0 2px 0 rgba(0, 0, 0, .06);
+    opacity: 1;
+
+    .platform-darwin & { // sass-lint:disable-line class-name-format
+        top: 27px;
+    }
+
+    .platform-linux & { // sass-lint:disable-line class-name-format
+        top: 0;
+    }
+
+    .bd-settingsButtonBtn {
+        backface-visibility: hidden;
+        -webkit-backface-visibility: hidden;
+        width: 70px;
+        height: 48px;
+        cursor: pointer;
+        filter: grayscale(100%);
+        opacity: .5;
+        position: relative;
+        transition: all .3s cubic-bezier(.4, 0, 0, 1);
+
+        &::before,
+        &::after {
+            content: '';
+            display: block;
+            position: absolute;
+            top: 0;
+            left: 0;
+            background-repeat: no-repeat;
+            background-position: center;
+        }
+
+        &::before {
+            width: 70px;
+            height: 48px;
+            background-image: $logoSmallBw;
+            background-size: 50% 50%;
+            opacity: 1;
+            transition: all .3s cubic-bezier(.4, 0, 0, 1), opacity .01s;
+        }
+
+        &::after {
+            width: 130px;
+            height: 43px;
+            background-image: $logoBigBw;
+            background-size: 100% 100%;
+            transform: translate(-7px, 2px) scale(0. 5);
+            opacity: 0;
+            transition: all .3s cubic-bezier(.4, 0, 0, 1);
+        }
+
+        &:not(.bd-loading) {
+            &:hover {
+                filter: none;
+                opacity: 1;
+            }
+        }
+
+        &.bd-loading {
+            animation: bd-settingsButtonPulse 1.5s infinite;
+        }
+
+        &.bd-updates {
+            filter: hue-rotate(250deg) !important; // sass-lint:disable-line no-important
+            opacity: 1 !important; // sass-lint:disable-line no-important
+        }
+    }
+
+    &.bd-hideButton {
+        animation: bd-fadeOut .4s ease-out;
+
+        &.bd-active {
+            animation: bd-fadeIn .4s ease-in;
+        }
+
+        &:not(.bd-active) {
+            &:not(.bd-animating) {
+                display: none;
+            }
+        }
+    }
+
+    &.bd-active {
+        opacity: 1;
+    }
+
+    &.bd-active,
+    &.bd-hideButton {
+        background: transparent;
+        box-shadow: none;
+
+        .bd-settingsButtonBtn {
+            filter: none;
+            opacity: 1;
+            width: 130px;
+            height: 43px;
+            transform: translate(25px, 18px);
+            cursor: default;
+
+            &::before {
+                opacity: 0;
+                transform: translate(-16px, -3px) scale(1.9);
+                transition: all .3s cubic-bezier(.4, 0, 0, 1), opacity .1s .3s;
+            }
+
+            &::after {
+                opacity: 1;
+                transform: scale(1);
+            }
+        }
+    }
+
+    &.bd-active,
+    &.bd-animating {
+        z-index: 3001;
+    }
 }
diff --git a/client/src/styles/partials/bdsettings/sidebarview.scss b/client/src/styles/partials/bdsettings/sidebarview.scss
index a585e31ac..1781afd3b 100644
--- a/client/src/styles/partials/bdsettings/sidebarview.scss
+++ b/client/src/styles/partials/bdsettings/sidebarview.scss
@@ -1,180 +1,180 @@
 .bd-settings {
-	position: absolute;
-	backface-visibility: hidden;
-	-webkit-backface-visibility: hidden;
-	top: 22px;
-	left: 0;
-	bottom: 0;
-	z-index: 1001;
-	width: 310px;
-	transform: translateX(-310px);
-	opacity: 0;
-	transition: transform .3s cubic-bezier(.4,0,0,1), opacity .25s ease;
-	pointer-events: none;
-
-	&.bd-active {
-		width: 900px;
-		transform: none;
-		opacity: 1;
-	}
-
-	.bd-settingsX {
-		position: absolute;
-		top: 18px;
-		left: 255px;
-		border: 2px solid #6e6e6e;
-		border-radius: 50%;
-		width: 25px;
-		height: 25px;
-		justify-content: center;
-		display: flex;
-		align-items: center;
-		cursor: pointer;
-
-		.platform-darwin & { // sass-lint:disable-line class-name-format
-			top: 43px;
-		}
-
-		.bd-xText {
-			color: #72767d;
-			position: absolute;
-			top: 32px;
-			font-weight: 600;
-			font-size: 13px;
-		}
-
-		.bd-materialDesignIcon {
-			justify-content: center;
-			display: flex;
-			fill: #72767d;
-		}
-
-		&:hover {
-			background-color: hsla(218, 5%, 47%, .3);
-
-			.bd-materialDesignIcon {
-				fill: #fff;
-			}
-		}
-	}
-
-	.bd-info {
-		display: flex;
-		align-items: flex-end;
-		overflow: hidden;
-		padding: 0 25px;
-		margin: 10px 0;
-
-		.bd-vtext {
-			color: #414245;
-			font-weight: 700;
-			font-size: 12px;
-			flex-grow: 1;
-			height: 20px;
-			cursor: default;
-			user-select: none;
-		}
-
-		.bd-materialButton {
-			cursor: pointer;
-
-			&:hover {
-				.bd-materialDesignIcon {
-					fill: #fff;
-				}
-			}
-		}
-
-		.bd-materialDesignIcon {
-			fill: #414245;
-
-			&:hover {
-				fill: #fff;
-			}
-		}
-	}
-
-	.bd-sidebarView {
-		&::after {
-			content: '';
-			height: 100%;
-			width: 310px;
-			background-color: #202225;
-			top: 100%;
-			display: block;
-			position: absolute;
-		}
-
-		.bd-sidebarRegion {
-			.bd-scroller {
-				padding-top: 0;
-			}
-		}
-
-		.bd-contentRegion {
-			width: 590px;
-		}
-
-		&.bd-active {
-			.bd-contentRegion {
-				transition: all .3s cubic-bezier(.4,0,0,1);
-				transform: none;
-				opacity: 1;
-			}
-		}
-
-		&.bd-stop {
-			.bd-sidebarRegion {
-				z-index: 1003;
-			}
-
-			.bd-contentRegion {
-				z-index: 1002;
-			}
-		}
-	}
-
-	.platform-darwin & { // sass-lint:disable-line class-name-format
-		top: 0;
-
-		.bd-sidebarView {
-			.bd-sidebarRegion {
-				padding-top: 22px;
-			}
-		}
-	}
-
-	.platform-linux & { // sass-lint:disable-line class-name-format
-		top: 0;
-	}
-
-	&:not(.bd-active) > .bd-sidebarView.bd-active, // sass-lint:disable-line force-element-nesting
-	&.bd-settingsOut .bd-sidebarView.bd-active { // sass-lint:disable-line force-element-nesting
-		.bd-contentRegion {
-			transform: translate(-600px, 0%);
-			opacity: 0;
-			width: 590px;
-		}
-	}
-
-	&:not(.bd-active) {
-		.bd-sidebarView {
-			&.bd-active {
-				.bd-contentRegion {
-					transform: translate(-600px, 100%);
-				}
-			}
-		}
-	}
+    position: absolute;
+    backface-visibility: hidden;
+    -webkit-backface-visibility: hidden;
+    top: 22px;
+    left: 0;
+    bottom: 0;
+    z-index: 1001;
+    width: 310px;
+    transform: translateX(-310px);
+    opacity: 0;
+    transition: transform .3s cubic-bezier(.4, 0, 0, 1), opacity .25s ease;
+    pointer-events: none;
+
+    &.bd-active {
+        width: 900px;
+        transform: none;
+        opacity: 1;
+    }
+
+    .bd-settingsX {
+        position: absolute;
+        top: 18px;
+        left: 255px;
+        border: 2px solid #6e6e6e;
+        border-radius: 50%;
+        width: 25px;
+        height: 25px;
+        justify-content: center;
+        display: flex;
+        align-items: center;
+        cursor: pointer;
+
+        .platform-darwin & { // sass-lint:disable-line class-name-format
+            top: 43px;
+        }
+
+        .bd-xText {
+            color: #72767d;
+            position: absolute;
+            top: 32px;
+            font-weight: 600;
+            font-size: 13px;
+        }
+
+        .bd-materialDesignIcon {
+            justify-content: center;
+            display: flex;
+            fill: #72767d;
+        }
+
+        &:hover {
+            background-color: hsla(218, 5%, 47%, .3);
+
+            .bd-materialDesignIcon {
+                fill: #fff;
+            }
+        }
+    }
+
+    .bd-info {
+        display: flex;
+        align-items: flex-end;
+        overflow: hidden;
+        padding: 0 25px;
+        margin: 10px 0;
+
+        .bd-vtext {
+            color: #414245;
+            font-weight: 700;
+            font-size: 12px;
+            flex-grow: 1;
+            height: 20px;
+            cursor: default;
+            user-select: none;
+        }
+
+        .bd-materialButton {
+            cursor: pointer;
+
+            &:hover {
+                .bd-materialDesignIcon {
+                    fill: #fff;
+                }
+            }
+        }
+
+        .bd-materialDesignIcon {
+            fill: #414245;
+
+            &:hover {
+                fill: #fff;
+            }
+        }
+    }
+
+    .bd-sidebarView {
+        &::after {
+            content: '';
+            height: 100%;
+            width: 310px;
+            background-color: #202225;
+            top: 100%;
+            display: block;
+            position: absolute;
+        }
+
+        .bd-sidebarRegion {
+            .bd-scroller {
+                padding-top: 0;
+            }
+        }
+
+        .bd-contentRegion {
+            width: 590px;
+        }
+
+        &.bd-active {
+            .bd-contentRegion {
+                transition: all .3s cubic-bezier(.4, 0, 0, 1);
+                transform: none;
+                opacity: 1;
+            }
+        }
+
+        &.bd-stop {
+            .bd-sidebarRegion {
+                z-index: 1003;
+            }
+
+            .bd-contentRegion {
+                z-index: 1002;
+            }
+        }
+    }
+
+    .platform-darwin & { // sass-lint:disable-line class-name-format
+        top: 0;
+
+        .bd-sidebarView {
+            .bd-sidebarRegion {
+                padding-top: 22px;
+            }
+        }
+    }
+
+    .platform-linux & { // sass-lint:disable-line class-name-format
+        top: 0;
+    }
+
+    &:not(.bd-active) > .bd-sidebarView.bd-active, // sass-lint:disable-line force-element-nesting
+    &.bd-settingsOut .bd-sidebarView.bd-active { // sass-lint:disable-line force-element-nesting
+        .bd-contentRegion {
+            transform: translate(-600px, 0%);
+            opacity: 0;
+            width: 590px;
+        }
+    }
+
+    &:not(.bd-active) {
+        .bd-sidebarView {
+            &.bd-active {
+                .bd-contentRegion {
+                    transform: translate(-600px, 100%);
+                }
+            }
+        }
+    }
 }
 
 .bd-sidebar {
-	.bd-settingsButton {
-		position: absolute;
-		top: 0;
-
-		.platform-darwin & { // sass-lint:disable-line class-name-format
-			top: 22px;
-		}
-	}
+    .bd-settingsButton {
+        position: absolute;
+        top: 0;
+
+        .platform-darwin & { // sass-lint:disable-line class-name-format
+            top: 22px;
+        }
+    }
 }
diff --git a/client/src/styles/partials/generic/drawers.scss b/client/src/styles/partials/generic/drawers.scss
index cc2be433a..158b0618d 100644
--- a/client/src/styles/partials/generic/drawers.scss
+++ b/client/src/styles/partials/generic/drawers.scss
@@ -28,21 +28,23 @@
 
         .bd-chevron1 {
             position: absolute;
-            svg{
+
+            svg {
                 transform: scale(1) translateY(0);
             }
         }
 
-        .bd-chevron2{
+        .bd-chevron2 {
             position: absolute;
-            svg{
+
+            svg {
                 visibility: hidden;
-                transform: scale(1.4,.5) translateY(6px) rotate(180deg);
+                transform: scale(1.4, .5) translateY(6px) rotate(180deg);
             }
         }
 
         svg {
-            transition: transform .2s cubic-bezier(.2,0,0,1);
+            transition: transform .2s cubic-bezier(.2, 0, 0, 1);
         }
     }
 
@@ -79,7 +81,7 @@
             .bd-drawerOpenButton {
                 .bd-chevron1 {
                     svg {
-                        transform: scale(1.4,.5) translateY(-6px);
+                        transform: scale(1.4, .5) translateY(-6px);
                         visibility: hidden;
                     }
                 }
diff --git a/client/src/styles/partials/generic/forms/switches.scss b/client/src/styles/partials/generic/forms/switches.scss
index c9dba0340..bde31a755 100644
--- a/client/src/styles/partials/generic/forms/switches.scss
+++ b/client/src/styles/partials/generic/forms/switches.scss
@@ -47,7 +47,7 @@
             bottom: 3px;
             background: #f6f6f7;
             border-radius: 10px;
-            transition: all .15s cubic-bezier(.2,0,0,1);
+            transition: all .15s cubic-bezier(.2, 0, 0, 1);
             box-shadow: 0 3px 1px 0 rgba(0, 0, 0, .05), 0 2px 2px 0 rgba(0, 0, 0, .1), 0 3px 3px 0 rgba(0, 0, 0, .05);
         }
 
diff --git a/client/src/styles/partials/sidebarview/sidebar.scss b/client/src/styles/partials/sidebarview/sidebar.scss
index b05f00182..8055d3b2b 100644
--- a/client/src/styles/partials/sidebarview/sidebar.scss
+++ b/client/src/styles/partials/sidebarview/sidebar.scss
@@ -1,50 +1,51 @@
 .bd-sidebar {
-	width: 100%;
-	padding-right: 20px;
-	padding: 0;
+    width: 100%;
+    padding-right: 20px;
+    padding: 0;
 
-	.bd-header {
-		padding: 6px 0;
-		margin-left: 10px;
-		margin-top: 15px;
-		color: rgba(255, 255, 255, .15);
-		font-size: 14px;
-		line-height: 16px;
-		text-transform: uppercase;
-		font-weight: 600;
-		flex-shrink: 0;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-		font-family: Whitney, Helvetica Neue, Helvetica, Arial, sans-serif;
-	}
+    .bd-header {
+        padding: 6px 0;
+        margin-left: 10px;
+        margin-top: 15px;
+        color: rgba(255, 255, 255, .15);
+        font-size: 14px;
+        line-height: 16px;
+        text-transform: uppercase;
+        font-weight: 600;
+        flex-shrink: 0;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        font-family: Whitney, Helvetica Neue, Helvetica, Arial, sans-serif;
+    }
 
-	.bd-item {
-		border-radius: 3px;
-		margin-bottom: 2px;
-		padding-bottom: 6px;
-		padding-top: 6px;
-		padding: 6px 10px;
-		color: $coldimwhite;
-		cursor: pointer;
-		font-size: 17px;
-		line-height: 20px;
-		position: relative;
-		flex-shrink: 0;
-		font-weight: 500;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-		font-family: Whitney, Helvetica Neue, Helvetica, Arial, sans-serif;
+    .bd-item {
+        border-radius: 3px;
+        margin-bottom: 2px;
+        padding-bottom: 6px;
+        padding-top: 6px;
+        padding: 6px 10px;
+        color: $coldimwhite;
+        cursor: pointer;
+        font-size: 17px;
+        line-height: 20px;
+        position: relative;
+        flex-shrink: 0;
+        font-weight: 500;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        font-family: Whitney, Helvetica Neue, Helvetica, Arial, sans-serif;
 
-		&:hover {
-			background-color: rgba(185,185,185,.1);
-			color: #f6f6f6;
-		}
-		&.bd-active {
-			background: $colbdgreen;
-			color: #fff;
-			cursor: default;
-		}
-	}
+        &:hover {
+            background-color: rgba(185, 185, 185, .1);
+            color: #f6f6f6;
+        }
+
+        &.bd-active {
+            background: $colbdgreen;
+            color: #fff;
+            cursor: default;
+        }
+    }
 }

From 7f08ba27e6d445b3405d14261c77f160ce9de537 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 12:02:30 +0200
Subject: [PATCH 23/69] Remove my test script

---
 package.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e51201f7d..dc7329f92 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,6 @@
     "gulp_release": "gulp release",
     "release": "npm run lint && npm run build_release && gulp release && npm run package_release",
     "update_release": "npm run build_release && gulp build-release",
-    "inject": "node scripts/inject.js",
-    "tt": "npm run build --prefix core"
+    "inject": "node scripts/inject.js"
   }
 }

From 5597c485d15ac8b21fb760b368cfb2ede8bb977d Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 12:12:13 +0200
Subject: [PATCH 24/69] oops

---
 client/src/styles/partials/bdsettings/button.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/styles/partials/bdsettings/button.scss b/client/src/styles/partials/bdsettings/button.scss
index 78419865d..87a882b6e 100644
--- a/client/src/styles/partials/bdsettings/button.scss
+++ b/client/src/styles/partials/bdsettings/button.scss
@@ -52,7 +52,7 @@
             height: 43px;
             background-image: $logoBigBw;
             background-size: 100% 100%;
-            transform: translate(-7px, 2px) scale(0. 5);
+            transform: translate(-7px, 2px) scale(.5);
             opacity: 0;
             transition: all .3s cubic-bezier(.4, 0, 0, 1);
         }

From 99ef0d9f81b8d9c2fb02e43e3e36da6215515414 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 12:28:29 +0200
Subject: [PATCH 25/69] add bdedit

---
 editor/package.json          | 23 +++++++++++++++++++++
 editor/src/Editor.vue        | 12 +++++++++++
 editor/src/index.js          | 22 ++++++++++++++++++++
 editor/src/styles/index.scss |  0
 editor/webpack.config.js     | 39 ++++++++++++++++++++++++++++++++++++
 package-lock.json            | 16 ++++++++++++---
 package.json                 |  3 +++
 7 files changed, 112 insertions(+), 3 deletions(-)
 create mode 100644 editor/package.json
 create mode 100644 editor/src/Editor.vue
 create mode 100644 editor/src/index.js
 create mode 100644 editor/src/styles/index.scss
 create mode 100644 editor/webpack.config.js

diff --git a/editor/package.json b/editor/package.json
new file mode 100644
index 000000000..0e6922090
--- /dev/null
+++ b/editor/package.json
@@ -0,0 +1,23 @@
+{
+  "name": "bdeditorwindow",
+  "description": "BetterDiscord editor window",
+  "author": "JsSucks",
+  "version": "0.4.0",
+  "homepage": "https://betterdiscord.net",
+  "license": "MIT",
+  "main": "dist/csseditor.js",
+  "contributors": [
+    "Jiiks",
+    "Pohky"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/JsSucks/BetterDiscordApp.git"
+  },
+  "private": false,
+  "scripts": {
+    "build": "webpack --progress --colors",
+    "watch": "webpack --progress --colors --watch",
+    "release": "webpack --progress --colors --config=webpack.production.config.js"
+  }
+}
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
new file mode 100644
index 000000000..1406c1479
--- /dev/null
+++ b/editor/src/Editor.vue
@@ -0,0 +1,12 @@
+<template>
+    <div class="container"></div>
+</template>
+
+<script>
+
+    import { BDEdit } from 'bdedit';
+
+    export default {
+        components: { BDEdit }
+    }
+</script>
diff --git a/editor/src/index.js b/editor/src/index.js
new file mode 100644
index 000000000..756464ccf
--- /dev/null
+++ b/editor/src/index.js
@@ -0,0 +1,22 @@
+// const styles = require('./styles/index.scss');
+
+import Vue from 'vue';
+
+import Editor from './Editor.vue';
+import styles from './styles/index.scss';
+
+const mount = document.createElement('div');
+mount.classList.add('container');
+document.body.appendChild(mount);
+
+const vue = new Vue({
+    el: mount,
+    components: { Editor },
+    template: '<Editor/>'
+});
+
+const style = document.createElement('style');
+style.id = 'bd-main';
+style.type = 'text/css';
+style.appendChild(document.createTextNode(styles));
+document.head.appendChild(style);
diff --git a/editor/src/styles/index.scss b/editor/src/styles/index.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/editor/webpack.config.js b/editor/webpack.config.js
new file mode 100644
index 000000000..5a36e052a
--- /dev/null
+++ b/editor/webpack.config.js
@@ -0,0 +1,39 @@
+const path = require('path');
+const webpack = require('webpack');
+
+const vueLoader = {
+    test: /\.(vue)$/,
+    exclude: /node_modules/,
+    loader: 'vue-loader'
+};
+
+const scssLoader = {
+    test: /\.(css|scss)$/,
+    loader: ['css-loader', 'sass-loader']
+};
+
+module.exports = {
+    entry: './src/index.js',
+    output: {
+        path: path.resolve(__dirname, 'dist'),
+        filename: 'editor.js'
+    },
+    module: {
+        loaders: [vueLoader, scssLoader]
+    },
+    externals: {
+        electron: 'window.require("electron")',
+        fs: 'window.require("fs")',
+        util: 'window.require("util")',
+        process: 'require("process")'
+    },
+    resolve: {
+        alias: {
+            vue$: path.resolve('..', 'node_modules', 'vue', 'dist', 'vue.esm.js')
+        },
+        modules: [
+            path.resolve('..', 'node_modules'),
+            path.resolve('..', 'common', 'modules')
+        ]
+    }
+};
diff --git a/package-lock.json b/package-lock.json
index 1a7707419..81231f81c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,6 +15,12 @@
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg="
     },
+    "ace-builds": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.3.tgz",
+      "integrity": "sha512-T+e4DQRQR8ReNPOUryXWdXRX1NBTb9rB1y42IhnH4mmFe0NIIpAQVu8BQ9tgU2K3EGaPFZeG7E87OOjaXDP8PQ==",
+      "dev": true
+    },
     "acorn": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz",
@@ -1581,6 +1587,13 @@
         "tweetnacl": "0.14.5"
       }
     },
+    "bdedit": {
+      "version": "github:JsSucks/BDEdit#1ddc18aa4ae980cd0d50618ba4ffa73721a6819e",
+      "dev": true,
+      "requires": {
+        "ace-builds": "1.4.3"
+      }
+    },
     "beeper": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
@@ -2828,9 +2841,6 @@
         "randomfill": "1.0.4"
       }
     },
-    "csp-parse": {
-      "version": "github:macropodhq/csp-parse#db7d5f954b420b527d7fb452a93bb6e2fa302c5a"
-    },
     "css-color-names": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
diff --git a/package.json b/package.json
index dc7329f92..320248442 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "babel-preset-env": "^1.7.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-react": "^6.24.1",
+    "bdedit": "github:JsSucks/BDEdit",
     "codemirror": "^5.39.2",
     "combokeys": "^3.0.0",
     "css-loader": "^0.28.11",
@@ -82,6 +83,8 @@
     "watch_core": "npm run watch --prefix core",
     "build_csseditor": "npm run build --prefix csseditor",
     "watch_csseditor": "npm run watch --prefix csseditor",
+    "build_editor": "npm run build --prefix editor",
+    "watch_editor": "npm run watch --prefix editor",
     "lint": "eslint -f unix client/src core/src csseditor/src common && npm run sasslint",
     "lint_fix": "eslint -f unix client/src core/src csseditor/src common --fix",
     "sasslint": "sass-lint client/src/styles/**/*.scss -v",

From f1f23fa220c52c419722f760d0247d9f06801983 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 13:03:15 +0200
Subject: [PATCH 26/69] Initial BDEdit addition. No logic yet.

---
 core/src/main.js                | 11 ++--
 core/src/modules/editor.js      | 93 +++++++++++++++++++++++++++++++++
 core/src/modules/index.js       |  1 +
 editor/src/Editor.vue           | 22 +++++++-
 editor/src/styles/index.scss    | 20 +++++++
 editor/src/styles/titlebar.scss | 71 +++++++++++++++++++++++++
 editor/src/styles/vars.scss     |  2 +
 package-lock.json               |  2 +-
 package.json                    |  2 +-
 9 files changed, 216 insertions(+), 8 deletions(-)
 create mode 100644 core/src/modules/editor.js
 create mode 100644 editor/src/styles/titlebar.scss
 create mode 100644 editor/src/styles/vars.scss

diff --git a/core/src/main.js b/core/src/main.js
index 294944341..5b4caf580 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -21,7 +21,8 @@ const TEST_ARGS = () => {
         'paths': {
             'client': path.resolve(_basePath, 'client', 'dist'),
             'core': path.resolve(_basePath, 'core', 'dist'),
-            'data': path.resolve(_baseDataPath, 'data')
+            'data': path.resolve(_baseDataPath, 'data'),
+            'editor': path.resolve(_basePath, 'editor', 'dist')
         }
     }
 }
@@ -33,7 +34,7 @@ import deepmerge from 'deepmerge';
 import ContentSecurityPolicy from 'csp-parse';
 import keytar from 'keytar';
 
-import { FileUtils, BDIpc, Config, WindowUtils, CSSEditor, Database } from './modules';
+import { FileUtils, BDIpc, Config, WindowUtils, CSSEditor, Editor, Database } from './modules';
 
 const packageJson = require(path.resolve(__dirname, 'package.json'));
 const sparkplug = path.resolve(__dirname, 'sparkplug.js');
@@ -63,7 +64,8 @@ class Comms {
         BDIpc.on('bd-sendToDiscord', (event, m) => this.sendToDiscord(m.channel, m.message), true);
 
         // BDIpc.on('bd-openCssEditor', (event, options) => this.bd.csseditor.openEditor(options), true);
-        BDIpc.on('bd-sendToCssEditor', (event, m) => this.sendToCssEditor(m.channel, m.message), true);
+        // BDIpc.on('bd-sendToCssEditor', (event, m) => this.sendToCssEditor(m.channel, m.message), true);
+        BDIpc.on('bd-openCssEditor', (event, options) => this.bd.editor.openEditor(options), true);
 
         BDIpc.on('bd-native-open', (event, options) => {
             dialog.showOpenDialog(OriginalBrowserWindow.fromWebContents(event.ipcEvent.sender), options, filenames => {
@@ -148,7 +150,8 @@ export class BetterDiscord {
     get comms() { return this._comms ? this._comms : (this._commas = new Comms(this)); }
     get database() { return this._db ? this._db : (this._db = new Database(this.config.getPath('data'))); }
     get config() { return this._config ? this._config : (this._config = new Config(this._args)); }
-    get window() {  return this.windowUtils ? this.windowUtils.window : undefined; }
+    get window() { return this.windowUtils ? this.windowUtils.window : undefined; }
+    get editor() { return this._editor ? this._editor : (this._editor = new Editor(this, this.config.getPath('editor'))); }
 
     constructor(args) {
         if (TESTS) args = TEST_ARGS();
diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
new file mode 100644
index 000000000..0f4b46e71
--- /dev/null
+++ b/core/src/modules/editor.js
@@ -0,0 +1,93 @@
+/**
+ * BetterDiscord Editor Module
+ * Copyright (c) 2015-present JsSucks - https://github.com/JsSucks
+ * All rights reserved.
+ * https://github.com/JsSucks - https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+*/
+
+import path from 'path';
+import { BrowserWindow } from 'electron';
+
+import Module from './modulebase';
+import { WindowUtils } from './utils';
+import BDIpc from './bdipc';
+
+export default class Editor extends Module {
+
+    constructor(bd, path) {
+        super();
+        this.editorPath = path;
+        this.bd = bd;
+    }
+
+    /**
+     * Opens an editor.
+     * @return {Promise}
+     */
+    openEditor(options) {
+        return new Promise((resolve, reject) => {
+            if (this.editor) {
+                if (this.editor.isFocused()) return;
+
+                this.editor.focus();
+                this.editor.flashFrame(true);
+                return resolve(true);
+            }
+
+            options = Object.assign({}, this.options, options);
+
+            this.editor = new BrowserWindow(options);
+            this.editor.loadURL('about:blank');
+            this.editor.setSheetOffset(33);
+            this.editorUtils = new WindowUtils({ window: this.editor });
+
+            this.editor.on('close', () => {
+                this.bd.windowUtils.send('bd-save-csseditor-bounds', this.editor.getBounds());
+                this.editor = null;
+            });
+
+            this.editor.once('ready-to-show', () => {
+                this.editor.show();
+            });
+
+            this.editor.webContents.on('did-finish-load', () => {
+                this.editorUtils.injectScript(path.join(this.editorPath, 'editor.js'));
+                resolve(true);
+            });
+        })
+    }
+
+    /**
+     * Sends data to the editor.
+     * @param {String} channel
+     * @param {Any} data
+     */
+    send(channel, data) {
+        if (!this.editor) throw { message: 'The CSS editor is not open.' };
+        return BDIpc.send(this.editor, channel, data);
+    }
+
+    /**
+     * Sets the CSS editor's always on top flag.
+     */
+    set alwaysOnTop(state) {
+        if (!this.editor) return;
+        this.editor.setAlwaysOnTop(state);
+    }
+
+    /**
+     * Default options to pass to BrowserWindow.
+     */
+    get options() {
+        return {
+            width: 800,
+            height: 600,
+            show: false,
+            frame: false
+        };
+    }
+
+}
diff --git a/core/src/modules/index.js b/core/src/modules/index.js
index 5f922a23b..4a56e948f 100644
--- a/core/src/modules/index.js
+++ b/core/src/modules/index.js
@@ -2,4 +2,5 @@ export { default as BDIpc } from './bdipc';
 export { Utils, FileUtils, WindowUtils } from './utils';
 export { default as Config } from './config';
 export { default as CSSEditor } from './csseditor';
+export { default as Editor } from './editor';
 export { default as Database } from './database';
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index 1406c1479..e226b8e70 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -1,12 +1,30 @@
 <template>
-    <div class="container"></div>
+    <div class="container">
+        <div class="titlebar">
+            <div class="draggable"></div>
+            <div class="icon">
+                <div class="inner"></div>
+            </div>
+            <div class="title">Content Editor</div>
+            <div class="flex-spacer"></div>
+            <div class="controls">
+                <button :class="{active: alwaysOnTop}" ref="aot" title="Toggle always on top" @click="toggleaot">P</button>
+                <button title="Close CSS Editor" @click="close">X</button>
+            </div>
+        </div>
+        <BDEdit />
+    </div>
 </template>
 
 <script>
 
     import { BDEdit } from 'bdedit';
+    ace.acequire = ace.require;
 
     export default {
-        components: { BDEdit }
+        components: { BDEdit },
+        mounted() {
+            console.log(ace);
+        }
     }
 </script>
diff --git a/editor/src/styles/index.scss b/editor/src/styles/index.scss
index e69de29bb..8ec713efb 100644
--- a/editor/src/styles/index.scss
+++ b/editor/src/styles/index.scss
@@ -0,0 +1,20 @@
+@import './vars.scss';
+@import './titlebar.scss';
+
+html, body {
+    margin: 0;
+    padding: 0;
+    display: flex;
+    max-height: 100%;
+    height: 100%;
+    width: 100%;
+    background: #2c383e;
+    min-width: 700px;
+    min-height: 400px;
+}
+
+.container {
+    display: flex;
+    flex-grow: 1;
+    flex-direction: column;
+}
diff --git a/editor/src/styles/titlebar.scss b/editor/src/styles/titlebar.scss
new file mode 100644
index 000000000..b837087ab
--- /dev/null
+++ b/editor/src/styles/titlebar.scss
@@ -0,0 +1,71 @@
+.titlebar {
+    display: flex;
+    height: 25px;
+    padding: 4px 5px;
+    background: #292b2f;
+    border-bottom: 1px solid hsla(218,5%,47%,.3);
+    user-select: none;
+    cursor: default;
+
+    .icon {
+        width: 31px;
+        height: 25px;
+
+        .inner {
+            width: 25px;
+            height: 25px;
+            background-image: $bdicon;
+            background-size: 22px 22px;
+            background-repeat: no-repeat;
+            background-position: center;
+        }
+    }
+
+    .title {
+        color: #bac9d2;
+        font-family: Whitney,Helvetica Neue,Helvetica,Arial,sans-serif;
+        line-height: 25px;
+        font-size: 15px;
+    }
+
+    .controls {
+        margin: 0 0 0 2px;
+        font-size: 0;
+
+        button {
+            -webkit-app-region: no-drag;
+            border-radius: 3px;
+            width: 25px;
+            font-size: 12px;
+            font-weight: 600;
+            background: #36393f;
+            color: #bac9d2;
+            font-family: Whitney,Helvetica Neue,Helvetica,Arial,sans-serif;
+            transition: background-color .2s ease, color .2s ease;
+            cursor: default;
+            border: 0;
+            height: 25px;
+            z-index: 900062;
+            padding: 0;
+            margin: 0 0 0 4px;
+
+            &:hover {
+                background: #44474e;
+                color: #FFF;
+            }
+
+            &.active {
+                background: #3a71c1;
+            }
+        }
+    }
+
+    .draggable {
+        top: 0;
+        left: 0;
+        right: 63px;
+        position: absolute;
+        height: 33px;
+        -webkit-app-region: drag;
+    }
+}
diff --git a/editor/src/styles/vars.scss b/editor/src/styles/vars.scss
new file mode 100644
index 000000000..202ab7087
--- /dev/null
+++ b/editor/src/styles/vars.scss
@@ -0,0 +1,2 @@
+$logoSmallGw: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkltYWdlIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDUxMiA1MTIiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDUxMiA1MTI7IiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGUgdHlwZT0idGV4dC9jc3MiPi5zdDB7ZGlzcGxheTpub25lO30uc3Qxe2Rpc3BsYXk6aW5saW5lO2ZpbGw6IzAyMDAzNTtzdHJva2U6IzAwMDAwMDtzdHJva2UtbWl0ZXJsaW1pdDoxMDt9LnN0MntmaWxsOiMzRUNDOUU7fS5zdDN7ZmlsbDojRkZGRkZGO308L3N0eWxlPjxnIGlkPSJMYXllcl8yIiBjbGFzcz0ic3QwIj48cmVjdCB4PSItNjQiIHk9Ii0zMiIgY2xhc3M9InN0MSIgd2lkdGg9IjYxOCIgaGVpZ2h0PSI1NzIiLz48L2c+PGcgaWQ9IkxheWVyXzEiIHhtbG5zOnZlY3Rvcm5hdG9yPSJodHRwOi8vdmVjdG9ybmF0b3IuaW8iPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik03MCwxOC44Yy0xMy43LDAtMjcuMywxMy43LTI3LjMsMjcuM3YyMzMuNkM0Mi43LDM5Ny43LDEzNy45LDQ5MywyNTYsNDkzYzI5LjcsMCw1OC02LjEsODMuNi0xN1YzNDEuNWMtMTksMjUuNi00OS4zLDQyLjItODMuNiw0Mi4yYy01Ny42LDAtMTA0LjEtNDYuNS0xMDQuMS0xMDQuMVY0Ni4xYzAtMTMuNy0xMy43LTI3LjMtMjcuMy0yNy4zSDcweiIvPjxwYXRoIGNsYXNzPSJzdDMiIGQ9Ik0zODcuNCwxOC44Yy0xMy43LDAtMjcuMywxMy43LTI3LjMsMjcuM3Y0Ny4zQzMyOS4zLDc2LjIsMjkzLjksNjYuMywyNTYsNjYuM2MtMjkuOCwwLTU3LjksNi4zLTgzLjYsMTcuM3YxMzQuMmMxOS0yNS42LDQ5LjMtNDIuMiw4My42LTQyLjJjNTcuNiwwLDEwNC4xLDQ2LjUsMTA0LjEsMTA0LjF2MTg2LjJjNjUuMi0zNi40LDEwOS4yLTEwNiwxMDkuMi0xODYuMlY0Ni4xYzAtMTguOC0xMy43LTI3LjMtMjcuMy0yNy4zSDM4Ny40eiIvPjwvZz48L3N2Zz4=);
+$bdicon: $logoSmallGw;
diff --git a/package-lock.json b/package-lock.json
index 81231f81c..3d4e2421d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1588,7 +1588,7 @@
       }
     },
     "bdedit": {
-      "version": "github:JsSucks/BDEdit#1ddc18aa4ae980cd0d50618ba4ffa73721a6819e",
+      "version": "github:JsSucks/bdedit#1ddc18aa4ae980cd0d50618ba4ffa73721a6819e",
       "dev": true,
       "requires": {
         "ace-builds": "1.4.3"
diff --git a/package.json b/package.json
index 320248442..b137bf703 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
   "dependencies": {
     "asar": "^0.14.6",
     "csp-parse": "github:macropodhq/csp-parse",
+    "bdedit": "github:JsSucks/bdedit",
     "deepmerge": "^2.2.1",
     "fs-extra": "^7.0.0",
     "keytar": "^4.3.0",
@@ -33,7 +34,6 @@
     "babel-preset-env": "^1.7.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-react": "^6.24.1",
-    "bdedit": "github:JsSucks/BDEdit",
     "codemirror": "^5.39.2",
     "combokeys": "^3.0.0",
     "css-loader": "^0.28.11",

From a76938521965df08c26d2132e6328b31c10f9af1 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 16:04:25 +0200
Subject: [PATCH 27/69] Run scripts from editor in Discord window

---
 client/src/modules/csseditor.js |  8 ++++++
 core/src/main.js                | 10 ++++++++
 editor/src/Editor.vue           | 45 +++++++++++++++++++++++++++++++--
 package-lock.json               |  9 ++++---
 package.json                    |  2 +-
 5 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/client/src/modules/csseditor.js b/client/src/modules/csseditor.js
index 6534532b0..487c15161 100644
--- a/client/src/modules/csseditor.js
+++ b/client/src/modules/csseditor.js
@@ -38,6 +38,14 @@ export default new class {
         ClientIPC.on('bd-get-scss', () => this.scss, true);
         ClientIPC.on('bd-update-scss', (e, scss) => this.updateScss(scss));
         ClientIPC.on('bd-save-csseditor-bounds', (e, bounds) => this.saveEditorBounds(bounds));
+        ClientIPC.on('bd-runEditorScript', (e, script) => {
+            try {
+                new Function(script)();
+                e.reply('ok');
+            } catch (err) {
+                e.reply({ err: err.stack || err });
+            }
+        });
 
         ClientIPC.on('bd-save-scss', async (e, scss) => {
             await this.updateScss(scss);
diff --git a/core/src/main.js b/core/src/main.js
index 5b4caf580..aeae655df 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -53,10 +53,13 @@ const CSP = {
 class Comms {
     constructor(bd) {
         this.bd = bd;
+        this.editorListeners = this.editorListeners.bind(this);
         this.initListeners();
     }
 
     initListeners() {
+        this.editorListeners();
+
         BDIpc.on('ping', () => 'pong', true);
 
         BDIpc.on('bd-getConfig', () => this.bd.config.config, true);
@@ -93,6 +96,13 @@ class Comms {
         BDIpc.on('bd-keytar-find-credentials', (event, { service }) => keytar.findCredentials(service), true);
     }
 
+    editorListeners() {
+        BDIpc.on('bd-editor-runScript', async (event, script) => {
+            const result = await this.sendToDiscord('bd-runEditorScript', script);
+            event.reply(result);
+        });
+    }
+
     async send(channel, message) {
         BDIpc.send(channel, message);
     }
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index e226b8e70..ae0500dbe 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -12,19 +12,60 @@
                 <button title="Close CSS Editor" @click="close">X</button>
             </div>
         </div>
-        <BDEdit />
+        <BDEdit
+            :files="files"
+            :snippets="snippets"
+            :updateContent="updateContent"
+            :runScript="runScript"
+        />
     </div>
 </template>
 
 <script>
 
+    import { ClientIPC } from 'common';
+    import { remote } from 'electron';
+
     import { BDEdit } from 'bdedit';
     ace.acequire = ace.require;
 
     export default {
+        data() {
+            return {
+                files: [{ type: 'file', name: 'custom.scss', content: 'asd', savedContent: 'asd', mode: 'scss', saved: true }],
+                snippets: [],
+                loading: true,
+                alwaysOnTop: false,
+                error: undefined
+            }
+        },
         components: { BDEdit },
+        created() {
+            ClientIPC.on('bd-editor-addFile', (_, file) => this.addFile(file));
+            ClientIPC.on('bd-editor-addSnippet', (_, snippet) => this.addSnippet(snippet));
+        },
         mounted() {
-            console.log(ace);
+        },
+        methods: {
+            addFile(file) { this.files.push(file) },
+            addSnippet(snippet) { this.snippets.push(file) },
+
+            updateContent(item, content) {
+                item.content = content;
+                item.saved = item.content === item.savedContent;
+            },
+
+            async runScript(script) {
+                return ClientIPC.send('editor-runScript', script);
+            },
+
+            toggleaot() {
+                this.alwaysOnTop = !this.alwaysOnTop;
+                remote.getCurrentWindow().setAlwaysOnTop(this.alwaysOnTop);
+            },
+            close() {
+                window.close();
+            }
         }
     }
 </script>
diff --git a/package-lock.json b/package-lock.json
index 3d4e2421d..75f8c63f1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,8 +18,7 @@
     "ace-builds": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.3.tgz",
-      "integrity": "sha512-T+e4DQRQR8ReNPOUryXWdXRX1NBTb9rB1y42IhnH4mmFe0NIIpAQVu8BQ9tgU2K3EGaPFZeG7E87OOjaXDP8PQ==",
-      "dev": true
+      "integrity": "sha512-T+e4DQRQR8ReNPOUryXWdXRX1NBTb9rB1y42IhnH4mmFe0NIIpAQVu8BQ9tgU2K3EGaPFZeG7E87OOjaXDP8PQ=="
     },
     "acorn": {
       "version": "5.7.1",
@@ -1588,8 +1587,7 @@
       }
     },
     "bdedit": {
-      "version": "github:JsSucks/bdedit#1ddc18aa4ae980cd0d50618ba4ffa73721a6819e",
-      "dev": true,
+      "version": "github:JsSucks/bdedit#95cea7f8d55cf97a9e7dff9d0bf82c7af7c38312",
       "requires": {
         "ace-builds": "1.4.3"
       }
@@ -2841,6 +2839,9 @@
         "randomfill": "1.0.4"
       }
     },
+    "csp-parse": {
+      "version": "github:macropodhq/csp-parse#db7d5f954b420b527d7fb452a93bb6e2fa302c5a"
+    },
     "css-color-names": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
diff --git a/package.json b/package.json
index b137bf703..de2c3eee2 100644
--- a/package.json
+++ b/package.json
@@ -17,8 +17,8 @@
   "private": false,
   "dependencies": {
     "asar": "^0.14.6",
-    "csp-parse": "github:macropodhq/csp-parse",
     "bdedit": "github:JsSucks/bdedit",
+    "csp-parse": "github:macropodhq/csp-parse",
     "deepmerge": "^2.2.1",
     "fs-extra": "^7.0.0",
     "keytar": "^4.3.0",

From 691c9f378a235c8718145848136635c5c9bbc2a9 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 18:29:00 +0200
Subject: [PATCH 28/69] new file/snippet

---
 editor/src/Editor.vue | 61 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index ae0500dbe..71430d379 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -17,6 +17,10 @@
             :snippets="snippets"
             :updateContent="updateContent"
             :runScript="runScript"
+            :newFile="newFile"
+            :saveFile="saveFile"
+            :newSnippet="newSnippet"
+            :saveSnippet="saveSnippet"
         />
     </div>
 </template>
@@ -29,6 +33,21 @@
     import { BDEdit } from 'bdedit';
     ace.acequire = ace.require;
 
+    const modes = {
+        'css': 'css',
+        'scss': 'scss',
+        'js': 'js',
+        'txt': 'text',
+        'json': 'json'
+    };
+
+    function resolveMode(fileName) {
+        if (!fileName.includes('.')) return 'text';
+        const ext = fileName.substr(fileName.lastIndexOf('.') + 1);
+        if (modes.hasOwnProperty(ext)) return modes[ext];
+        return 'text';
+    }
+
     export default {
         data() {
             return {
@@ -59,6 +78,48 @@
                 return ClientIPC.send('editor-runScript', script);
             },
 
+            newFile(fileName) {
+                const prefix = fileName;
+                const mode = resolveMode(fileName);
+
+                let newName = prefix;
+                let iter = 0;
+
+                while (this.files.find(file => file.name === newName)) {
+                    newName = `${prefix}_${iter}`;
+                    iter++;
+                }
+
+                const newItem = { type: 'file', name: newName, content: '', mode, saved: false };
+                this.files.push(newItem);
+                return newItem;
+            },
+
+            newSnippet(snippetName) {
+                const prefix = snippetName;
+                const mode = resolveMode(snippetName);
+
+                let newName = prefix;
+                let iter = 0;
+
+                while (this.snippets.find(snippet => snippet.name === newName)) {
+                    newName = `${prefix}_${iter}`;
+                    iter++;
+                }
+
+                const newItem = { type: 'snippet', name: newName, content: '', mode, saved: false };
+                this.snippets.push(newItem);
+                return newItem;
+            },
+
+            saveFile(file) {
+                
+            },
+
+            saveSnippet(snippet) {
+
+            },
+
             toggleaot() {
                 this.alwaysOnTop = !this.alwaysOnTop;
                 remote.getCurrentWindow().setAlwaysOnTop(this.alwaysOnTop);

From 3fc1adc503b6c6a352798afdc850b261a7f5ee4d Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 18:39:28 +0200
Subject: [PATCH 29/69] get files/snippets from core

---
 core/src/main.js      | 12 ++++++++++++
 editor/src/Editor.vue | 34 ++++++++++++++++++++++------------
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/core/src/main.js b/core/src/main.js
index aeae655df..3f2efbacc 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -101,6 +101,18 @@ class Comms {
             const result = await this.sendToDiscord('bd-runEditorScript', script);
             event.reply(result);
         });
+
+        BDIpc.on('bd-editor-getFiles', async (event) => {
+            event.reply([
+                { type: 'file', name: 'custom.scss', content: '', savedContent: '', mode: 'scss', saved: true }
+            ]);
+        });
+
+        BDIpc.on('bd-editor-getSnippets', async (event) => {
+            event.reply([
+                { type: 'snippet', name: 'test.js', content: '', savedContent: '', mode: 'javascript', saved: true }
+            ]);
+        });
     }
 
     async send(channel, message) {
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index 71430d379..140c18c90 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -12,16 +12,17 @@
                 <button title="Close CSS Editor" @click="close">X</button>
             </div>
         </div>
-        <BDEdit
-            :files="files"
-            :snippets="snippets"
-            :updateContent="updateContent"
-            :runScript="runScript"
-            :newFile="newFile"
-            :saveFile="saveFile"
-            :newSnippet="newSnippet"
-            :saveSnippet="saveSnippet"
-        />
+        <div id="spinner" v-if="loading">
+            <div class="valign">Loading Please Wait...</div>
+        </div>
+        <BDEdit v-else :files="files"
+                :snippets="snippets"
+                :updateContent="updateContent"
+                :runScript="runScript"
+                :newFile="newFile"
+                :saveFile="saveFile"
+                :newSnippet="newSnippet"
+                :saveSnippet="saveSnippet" />
     </div>
 </template>
 
@@ -51,7 +52,7 @@
     export default {
         data() {
             return {
-                files: [{ type: 'file', name: 'custom.scss', content: 'asd', savedContent: 'asd', mode: 'scss', saved: true }],
+                files: [],
                 snippets: [],
                 loading: true,
                 alwaysOnTop: false,
@@ -64,9 +65,17 @@
             ClientIPC.on('bd-editor-addSnippet', (_, snippet) => this.addSnippet(snippet));
         },
         mounted() {
+            (async () => {
+                this.files = await ClientIPC.send('bd-editor-getFiles');
+                this.snippets = await ClientIPC.send('bd-editor-getSnippets');
+
+                this.loading = false;
+            })();
         },
         methods: {
-            addFile(file) { this.files.push(file) },
+            addFile(file) {
+                this.files.push(file);
+            },
             addSnippet(snippet) { this.snippets.push(file) },
 
             updateContent(item, content) {
@@ -124,6 +133,7 @@
                 this.alwaysOnTop = !this.alwaysOnTop;
                 remote.getCurrentWindow().setAlwaysOnTop(this.alwaysOnTop);
             },
+
             close() {
                 window.close();
             }

From 8c04e7d2d35b8f1220e372c7cec8167d1fe463a2 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 18:43:58 +0200
Subject: [PATCH 30/69] File/snippet saving signals

---
 core/src/main.js      | 10 ++++++++++
 editor/src/Editor.vue | 10 ++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/core/src/main.js b/core/src/main.js
index 3f2efbacc..18aa7bc02 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -113,6 +113,16 @@ class Comms {
                 { type: 'snippet', name: 'test.js', content: '', savedContent: '', mode: 'javascript', saved: true }
             ]);
         });
+
+        BDIpc.on('bd-editor-saveFile', async (event, file) => {
+            console.log(file);
+            event.reply('ok');
+        });
+
+        BDIpc.on('bd-editor-saveSnippet', async (event, snippet) => {
+            console.log(snippet);
+            event.reply('ok');
+        });
     }
 
     async send(channel, message) {
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index 140c18c90..b79261d2e 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -121,12 +121,14 @@
                 return newItem;
             },
 
-            saveFile(file) {
-                
+            async saveFile(file) {
+                const result = await ClientIPC.send('bd-editor-saveFile', file);
+                console.log(result);
             },
 
-            saveSnippet(snippet) {
-
+            async saveSnippet(snippet) {
+                const result = await ClientIPC.send('bd-editor-saveSnippet', snippet);
+                console.log(result);
             },
 
             toggleaot() {

From d1fd5ae881574d10af852fc8e7b8d64e4438cc15 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 19:46:11 +0200
Subject: [PATCH 31/69] imodule and base for new editor module in client

---
 client/src/index.js                       |  4 +--
 client/src/modules/csseditor.js           |  2 +-
 client/src/modules/editor.js              | 40 +++++++++++++++++++++
 client/src/modules/imodule.js             | 44 +++++++++++++++++++++++
 client/src/modules/modules.js             |  1 +
 client/src/ui/components/bd/CssEditor.vue | 18 +++++-----
 core/src/main.js                          |  7 ++--
 7 files changed, 103 insertions(+), 13 deletions(-)
 create mode 100644 client/src/modules/editor.js
 create mode 100644 client/src/modules/imodule.js

diff --git a/client/src/index.js b/client/src/index.js
index c64134a0b..5d2e315d7 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -10,7 +10,7 @@
 
 import { DOM, BdUI, BdMenu, Modals, Toasts, Notifications, BdContextMenu, DiscordContextMenu } from 'ui';
 import BdCss from './styles/index.scss';
-import { Events, CssEditor, Globals, Settings, Database, Updater, ModuleManager, PluginManager, ThemeManager, ExtModuleManager, Vendor, Patcher, MonkeyPatch, ReactComponents, ReactHelpers, ReactAutoPatcher, DiscordApi, BdWebApi, Connectivity, Cache, Reflection, PackageInstaller } from 'modules';
+import { Events, Globals, Settings, Database, Updater, ModuleManager, PluginManager, ThemeManager, ExtModuleManager, Vendor, Patcher, MonkeyPatch, ReactComponents, ReactHelpers, ReactAutoPatcher, DiscordApi, BdWebApi, Connectivity, Cache, Reflection, PackageInstaller } from 'modules';
 import { ClientLogger as Logger, ClientIPC, Utils } from 'common';
 import { BuiltinManager, EmoteModule, ReactDevtoolsModule, VueDevtoolsModule, TrackingProtection, E2EE } from 'builtin';
 import electron from 'electron';
@@ -30,7 +30,7 @@ class BetterDiscord {
         this._bd = {
             DOM, BdUI, BdMenu, Modals, Reflection, Toasts, Notifications, BdContextMenu, DiscordContextMenu,
 
-            Events, CssEditor, Globals, Settings, Database, Updater,
+            Events, Globals, Settings, Database, Updater,
             ModuleManager, PluginManager, ThemeManager, ExtModuleManager, PackageInstaller,
             Vendor,
 
diff --git a/client/src/modules/csseditor.js b/client/src/modules/csseditor.js
index 487c15161..873a49436 100644
--- a/client/src/modules/csseditor.js
+++ b/client/src/modules/csseditor.js
@@ -38,7 +38,7 @@ export default new class {
         ClientIPC.on('bd-get-scss', () => this.scss, true);
         ClientIPC.on('bd-update-scss', (e, scss) => this.updateScss(scss));
         ClientIPC.on('bd-save-csseditor-bounds', (e, bounds) => this.saveEditorBounds(bounds));
-        ClientIPC.on('bd-runEditorScript', (e, script) => {
+        ClientIPC.on('bd-editor-runScript', (e, script) => {
             try {
                 new Function(script)();
                 e.reply('ok');
diff --git a/client/src/modules/editor.js b/client/src/modules/editor.js
new file mode 100644
index 000000000..b4cea53e1
--- /dev/null
+++ b/client/src/modules/editor.js
@@ -0,0 +1,40 @@
+/**
+ * BetterDiscord Editor Module
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+*/
+
+import { FileUtils, ClientLogger as Logger, ClientIPC } from 'common';
+import Module from './imodule';
+
+export default new class extends Module {
+
+    setInitialState(state) {
+        return {
+            editorBounds: undefined
+        };
+    }
+
+    events() {
+        ClientIPC.on('editor-runScript', (e, script) => {
+            try {
+                new Function(script)();
+                e.reply('ok');
+            } catch (err) {
+                e.reply({ err: err.stack || err });
+            }
+        });
+    }
+
+    /**
+     * Show editor, flashes if already visible.
+     */
+    async show() {
+        await ClientIPC.send('editor-open', this.state.editorBounds);
+    }
+
+}
diff --git a/client/src/modules/imodule.js b/client/src/modules/imodule.js
new file mode 100644
index 000000000..0afbad3c0
--- /dev/null
+++ b/client/src/modules/imodule.js
@@ -0,0 +1,44 @@
+/**
+ * BetterDiscord Module Base
+ * Copyright (c) 2015-present JsSucks - https://github.com/JsSucks
+ * All rights reserved.
+ * https://github.com/JsSucks - https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+*/
+
+/**
+ * Base Module that every non-static module should extend
+ */
+export default class Module {
+
+    constructor(args) {
+        this.__ = {
+            state: args || {},
+            args
+        };
+        this.setState = this.setState.bind(this);
+        this.initialize();
+    }
+
+    initialize() {
+        if (this.bindings) this.bindings();
+        if (this.setInitialState) this.setState(this.setInitialState(this.state));
+        if (this.events) this.events();
+        if (this.init) this.init();
+    }
+
+    setState(newState) {
+        const oldState = this.state;
+        Object.assign(this.state, newState);
+        if (this.stateChanged) this.stateChanged(oldState, newState);
+    }
+
+    set args(t) { }
+    get args() { return this.__.args; }
+
+    set state(state) { return this.__.state = state; }
+    get state() { return this.__.state; }
+
+}
diff --git a/client/src/modules/modules.js b/client/src/modules/modules.js
index 239e89f8b..437f54fc1 100644
--- a/client/src/modules/modules.js
+++ b/client/src/modules/modules.js
@@ -1,5 +1,6 @@
 export { default as Events } from './events';
 export { default as CssEditor } from './csseditor';
+export { default as Editor } from './editor';
 export { default as Globals } from './globals';
 export { default as Settings } from './settings';
 export { default as Database } from './database';
diff --git a/client/src/ui/components/bd/CssEditor.vue b/client/src/ui/components/bd/CssEditor.vue
index 18a39f577..a56396417 100644
--- a/client/src/ui/components/bd/CssEditor.vue
+++ b/client/src/ui/components/bd/CssEditor.vue
@@ -8,6 +8,8 @@
  * LICENSE file in the root directory of this source tree.
 */
 
+// TODO this should be remade as editor instead of css editor
+
 <template>
     <SettingsWrapper headertext="CSS Editor">
         <div class="bd-cssEditor">
@@ -49,7 +51,7 @@
 
 <script>
     // Imports
-    import { Settings, CssEditor } from 'modules';
+    import { Settings, Editor } from 'modules';
     import { SettingsWrapper } from './';
     import { FormButton } from '../common';
     import SettingsPanel from './SettingsPanel.vue';
@@ -64,18 +66,18 @@
         },
         data() {
             return {
-                CssEditor
+                Editor
             };
         },
         computed: {
             error() {
-                return this.CssEditor.error;
+                return this.Editor.error;
             },
             compiling() {
-                return this.CssEditor.compiling;
+                return this.Editor.compiling;
             },
             systemEditorPath() {
-                return this.CssEditor.filePath;
+                return this.Editor.filePath;
             },
             liveUpdateSetting() {
                 return Settings.getSetting('css', 'default', 'live-update');
@@ -92,13 +94,13 @@
         },
         methods: {
             openInternalEditor() {
-                this.CssEditor.show();
+                this.Editor.show();
             },
             openSystemEditor() {
-                this.CssEditor.openSystemEditor();
+                // this.Editor.openSystemEditor();
             },
             recompile() {
-                this.CssEditor.recompile();
+                // this.Editor.recompile();
             }
         }
     }
diff --git a/core/src/main.js b/core/src/main.js
index 18aa7bc02..1b07067f6 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -68,7 +68,7 @@ class Comms {
 
         // BDIpc.on('bd-openCssEditor', (event, options) => this.bd.csseditor.openEditor(options), true);
         // BDIpc.on('bd-sendToCssEditor', (event, m) => this.sendToCssEditor(m.channel, m.message), true);
-        BDIpc.on('bd-openCssEditor', (event, options) => this.bd.editor.openEditor(options), true);
+        // BDIpc.on('bd-openCssEditor', (event, options) => this.bd.editor.openEditor(options), true);
 
         BDIpc.on('bd-native-open', (event, options) => {
             dialog.showOpenDialog(OriginalBrowserWindow.fromWebContents(event.ipcEvent.sender), options, filenames => {
@@ -97,8 +97,11 @@ class Comms {
     }
 
     editorListeners() {
+        BDIpc.on('bd-openCssEditor', (event, options) => this.bd.editor.openEditor(options), true);
+        BDIpc.on('bd-editor-open', (event, options) => this.bd.editor.openEditor(options), true);
+
         BDIpc.on('bd-editor-runScript', async (event, script) => {
-            const result = await this.sendToDiscord('bd-runEditorScript', script);
+            const result = await this.sendToDiscord('bd-editor-runScript', script);
             event.reply(result);
         });
 

From da1fc0a2f012e9dd336fed7f4b1349aac81b8b48 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 19:57:46 +0200
Subject: [PATCH 32/69] Smol things

---
 client/src/modules/editor.js        | 10 +++++----
 client/src/modules/imodule.js       | 35 ++++++++++++++++++++++++++---
 client/src/modules/modulemanager.js |  3 +--
 3 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/client/src/modules/editor.js b/client/src/modules/editor.js
index b4cea53e1..2f5a8e109 100644
--- a/client/src/modules/editor.js
+++ b/client/src/modules/editor.js
@@ -8,19 +8,21 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { FileUtils, ClientLogger as Logger, ClientIPC } from 'common';
 import Module from './imodule';
 
 export default new class extends Module {
 
+    get name() { return 'Editor' }
+    get delay() { return false; }
+
     setInitialState(state) {
         return {
             editorBounds: undefined
         };
     }
 
-    events() {
-        ClientIPC.on('editor-runScript', (e, script) => {
+    events(ipc) {
+        ipc.on('editor-runScript', (e, script) => {
             try {
                 new Function(script)();
                 e.reply('ok');
@@ -34,7 +36,7 @@ export default new class extends Module {
      * Show editor, flashes if already visible.
      */
     async show() {
-        await ClientIPC.send('editor-open', this.state.editorBounds);
+        await this.send('editor-open', this.state.editorBounds);
     }
 
 }
diff --git a/client/src/modules/imodule.js b/client/src/modules/imodule.js
index 0afbad3c0..88742d08e 100644
--- a/client/src/modules/imodule.js
+++ b/client/src/modules/imodule.js
@@ -11,6 +11,9 @@
 /**
  * Base Module that every non-static module should extend
  */
+
+import { ClientLogger as Logger, ClientIPC } from 'common';
+
 export default class Module {
 
     constructor(args) {
@@ -19,14 +22,20 @@ export default class Module {
             args
         };
         this.setState = this.setState.bind(this);
-        this.initialize();
+        
+        if (this.delay) { // If delay is set then module is set to load delayed from modulemanager
+            this.initialize = this.initialize.bind(this);
+            this.init = this.initialize;
+        } else {
+            this.initialize();
+            this.init = () => { };
+        }
     }
 
     initialize() {
         if (this.bindings) this.bindings();
         if (this.setInitialState) this.setState(this.setInitialState(this.state));
-        if (this.events) this.events();
-        if (this.init) this.init();
+        if (this.events) this.events(ClientIPC);
     }
 
     setState(newState) {
@@ -41,4 +50,24 @@ export default class Module {
     set state(state) { return this.__.state = state; }
     get state() { return this.__.state; }
 
+    async send(channel, message) {
+        return ClientIPC.send(channel, message);
+    }
+
+    log(msg) {
+        Logger.log(this.name, msg);
+    }
+
+    warn(msg) {
+        Logger.log(this.name, msg);
+    }
+
+    err(msg) {
+        Logger.log(this.name, msg);
+    }
+
+    info(msg) {
+        Logger.log(this.name, msg);
+    }
+
 }
diff --git a/client/src/modules/modulemanager.js b/client/src/modules/modulemanager.js
index 962b7e934..13b948712 100644
--- a/client/src/modules/modulemanager.js
+++ b/client/src/modules/modulemanager.js
@@ -9,7 +9,7 @@
 */
 
 import { ClientLogger as Logger } from 'common';
-import { SocketProxy, EventHook, CssEditor } from 'modules';
+import { SocketProxy, EventHook } from 'modules';
 import { ProfileBadges, ClassNormaliser } from 'ui';
 import Updater from './updater';
 
@@ -27,7 +27,6 @@ export default class {
             new ClassNormaliser(),
             new SocketProxy(),
             new EventHook(),
-            CssEditor,
             Updater
         ]);
     }

From 1a26e77dd9de056582cee5c95a876d6fd06c9638 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 21:24:37 +0200
Subject: [PATCH 33/69] Move editor events to editor

---
 client/src/index.js        |  2 +-
 core/src/main.js           | 35 +----------------------------------
 core/src/modules/editor.js | 37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/client/src/index.js b/client/src/index.js
index 5d2e315d7..de27de87d 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -18,7 +18,7 @@ import path from 'path';
 import { setTimeout } from 'timers';
 
 const tests = typeof PRODUCTION === 'undefined';
-const ignoreExternal = false;
+const ignoreExternal = true;
 
 class BetterDiscord {
 
diff --git a/core/src/main.js b/core/src/main.js
index 1b07067f6..a9f2c642c 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -58,8 +58,6 @@ class Comms {
     }
 
     initListeners() {
-        this.editorListeners();
-
         BDIpc.on('ping', () => 'pong', true);
 
         BDIpc.on('bd-getConfig', () => this.bd.config.config, true);
@@ -96,38 +94,6 @@ class Comms {
         BDIpc.on('bd-keytar-find-credentials', (event, { service }) => keytar.findCredentials(service), true);
     }
 
-    editorListeners() {
-        BDIpc.on('bd-openCssEditor', (event, options) => this.bd.editor.openEditor(options), true);
-        BDIpc.on('bd-editor-open', (event, options) => this.bd.editor.openEditor(options), true);
-
-        BDIpc.on('bd-editor-runScript', async (event, script) => {
-            const result = await this.sendToDiscord('bd-editor-runScript', script);
-            event.reply(result);
-        });
-
-        BDIpc.on('bd-editor-getFiles', async (event) => {
-            event.reply([
-                { type: 'file', name: 'custom.scss', content: '', savedContent: '', mode: 'scss', saved: true }
-            ]);
-        });
-
-        BDIpc.on('bd-editor-getSnippets', async (event) => {
-            event.reply([
-                { type: 'snippet', name: 'test.js', content: '', savedContent: '', mode: 'javascript', saved: true }
-            ]);
-        });
-
-        BDIpc.on('bd-editor-saveFile', async (event, file) => {
-            console.log(file);
-            event.reply('ok');
-        });
-
-        BDIpc.on('bd-editor-saveSnippet', async (event, snippet) => {
-            console.log(snippet);
-            event.reply('ok');
-        });
-    }
-
     async send(channel, message) {
         BDIpc.send(channel, message);
     }
@@ -207,6 +173,7 @@ export class BetterDiscord {
 
         configProxy = () => this.config;
         const autoInitComms = this.comms;
+        const autoInitEditor = this.editor;
         this.init();
     }
 
diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index 0f4b46e71..5f4737b8f 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -21,6 +21,39 @@ export default class Editor extends Module {
         super();
         this.editorPath = path;
         this.bd = bd;
+        this.initListeners();
+    }
+
+    initListeners() {
+        BDIpc.on('bd-openCssEditor', (event, options) => this.openEditor(options), true);
+        BDIpc.on('bd-editor-open', (event, options) => this.openEditor(options), true);
+
+        BDIpc.on('bd-editor-runScript', async (event, script) => {
+            const result = await this.sendToDiscord('bd-editor-runScript', script);
+            event.reply(result);
+        });
+
+        BDIpc.on('bd-editor-getFiles', async (event) => {
+            event.reply([
+                { type: 'file', name: 'custom.scss', content: '', savedContent: '', mode: 'scss', saved: true }
+            ]);
+        });
+
+        BDIpc.on('bd-editor-getSnippets', async (event) => {
+            event.reply([
+                { type: 'snippet', name: 'test.js', content: '', savedContent: '', mode: 'javascript', saved: true }
+            ]);
+        });
+
+        BDIpc.on('bd-editor-saveFile', async (event, file) => {
+            console.log(file);
+            event.reply('ok');
+        });
+
+        BDIpc.on('bd-editor-saveSnippet', async (event, snippet) => {
+            console.log(snippet);
+            event.reply('ok');
+        });
     }
 
     /**
@@ -70,6 +103,10 @@ export default class Editor extends Module {
         return BDIpc.send(this.editor, channel, data);
     }
 
+    async sendToDiscord(channel, message) {
+        return this.bd.windowUtils.send(channel, message);
+    }
+
     /**
      * Sets the CSS editor's always on top flag.
      */

From 3436bbe52b673cbed0f499c55588d22ecdb9b65b Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 21:26:52 +0200
Subject: [PATCH 34/69] add editor test flag

---
 core/src/main.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/main.js b/core/src/main.js
index a9f2c642c..021dba70e 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -26,6 +26,7 @@ const TEST_ARGS = () => {
         }
     }
 }
+const TEST_EDITOR = true;
 
 import path from 'path';
 import sass from 'node-sass';
@@ -53,7 +54,6 @@ const CSP = {
 class Comms {
     constructor(bd) {
         this.bd = bd;
-        this.editorListeners = this.editorListeners.bind(this);
         this.initListeners();
     }
 
@@ -199,6 +199,7 @@ export class BetterDiscord {
 
         setTimeout(() => {
             this.injectScripts();
+            if (TEST_EDITOR) this.editor.openEditor({});
         }, 500);
     }
 

From b14bf93ef95dd43548ec794166c709956475ee53 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 21:27:05 +0200
Subject: [PATCH 35/69] remove todo

---
 core/src/main.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/core/src/main.js b/core/src/main.js
index 021dba70e..b5da09698 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -188,9 +188,6 @@ export class BetterDiscord {
         await this.waitForWindowUtils();
         await this.ensureDirectories();
 
-        // TODO
-        // this.csseditor = new CSSEditor(this, this.config.getPath('csseditor'));
-
         this.windowUtils.on('did-finish-load', () => this.injectScripts(true));
 
         this.windowUtils.on('did-navigate-in-page', (event, url, isMainFrame) => {

From ed7abe357120ab88358635a78ef352b3598a42bc Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 21:29:54 +0200
Subject: [PATCH 36/69] Don't need all these prefixes since they're automated

---
 core/src/modules/editor.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index 5f4737b8f..9168feef0 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -25,32 +25,32 @@ export default class Editor extends Module {
     }
 
     initListeners() {
-        BDIpc.on('bd-openCssEditor', (event, options) => this.openEditor(options), true);
-        BDIpc.on('bd-editor-open', (event, options) => this.openEditor(options), true);
+        BDIpc.on('openCssEditor', (event, options) => this.openEditor(options), true);
+        BDIpc.on('editor-open', (event, options) => this.openEditor(options), true);
 
-        BDIpc.on('bd-editor-runScript', async (event, script) => {
-            const result = await this.sendToDiscord('bd-editor-runScript', script);
+        BDIpc.on('editor-runScript', async (event, script) => {
+            const result = await this.sendToDiscord('editor-runScript', script);
             event.reply(result);
         });
 
-        BDIpc.on('bd-editor-getFiles', async (event) => {
+        BDIpc.on('editor-getFiles', async (event) => {
             event.reply([
                 { type: 'file', name: 'custom.scss', content: '', savedContent: '', mode: 'scss', saved: true }
             ]);
         });
 
-        BDIpc.on('bd-editor-getSnippets', async (event) => {
+        BDIpc.on('editor-getSnippets', async (event) => {
             event.reply([
                 { type: 'snippet', name: 'test.js', content: '', savedContent: '', mode: 'javascript', saved: true }
             ]);
         });
 
-        BDIpc.on('bd-editor-saveFile', async (event, file) => {
+        BDIpc.on('editor-saveFile', async (event, file) => {
             console.log(file);
             event.reply('ok');
         });
 
-        BDIpc.on('bd-editor-saveSnippet', async (event, snippet) => {
+        BDIpc.on('editor-saveSnippet', async (event, snippet) => {
             console.log(snippet);
             event.reply('ok');
         });

From 5454950838f21fcc97ed8ce5f5d68529c0d6750f Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 21:36:04 +0200
Subject: [PATCH 37/69] add writefile

---
 core/src/modules/utils.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/core/src/modules/utils.js b/core/src/modules/utils.js
index d7e6262b6..4dd062e27 100644
--- a/core/src/modules/utils.js
+++ b/core/src/modules/utils.js
@@ -99,6 +99,15 @@ export class FileUtils {
         }
     }
 
+    static async writeFile(path, data, options = {}) {
+        return new Promise((resolve, reject) => {
+            fs.writeFile(path, data, options, err => {
+                if (err) return reject(err);
+                resolve();
+            });
+        });
+    }
+
     static async listDirectory(path) {
         try {
             await this.directoryExists(path);

From cf1da34e16577e6df01c4aa6fce50d249712126d Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 21:38:33 +0200
Subject: [PATCH 38/69] add editor file writing

---
 core/src/modules/editor.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index 9168feef0..afc43fffe 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -12,7 +12,7 @@ import path from 'path';
 import { BrowserWindow } from 'electron';
 
 import Module from './modulebase';
-import { WindowUtils } from './utils';
+import { WindowUtils, FileUtils } from './utils';
 import BDIpc from './bdipc';
 
 export default class Editor extends Module {
@@ -46,11 +46,16 @@ export default class Editor extends Module {
         });
 
         BDIpc.on('editor-saveFile', async (event, file) => {
-            console.log(file);
-            event.reply('ok');
+            try {
+                await FileUtils.writeFile(path.resolve(this.bd.config.getPath('data'), file.name), file.content);
+                event.reply('ok');
+            } catch (err) {
+                event.reply({ err });
+            }
         });
 
         BDIpc.on('editor-saveSnippet', async (event, snippet) => {
+            // TODO not sure how to store snippets yet
             console.log(snippet);
             event.reply('ok');
         });

From a3724d739bf1e1cc2b9e8f6d638ca569a864fa56 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 24 Feb 2019 21:56:46 +0200
Subject: [PATCH 39/69] Read files on load at least for now

---
 core/src/modules/editor.js | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index afc43fffe..bb9384945 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -34,9 +34,18 @@ export default class Editor extends Module {
         });
 
         BDIpc.on('editor-getFiles', async (event) => {
-            event.reply([
-                { type: 'file', name: 'custom.scss', content: '', savedContent: '', mode: 'scss', saved: true }
-            ]);
+            const exclude = ['db.json', 'emotes.json', 'storage', 'user.settings.json', 'window.json'];
+            const listFiles = await FileUtils.listDirectory(this.bd.config.getPath('data'));
+            const files = listFiles.filter(file => !exclude.includes(file));
+
+            const constructFiles = files.map(async file => {
+                const content = await FileUtils.readFile(path.resolve(this.bd.config.getPath('data'), file));
+                return { name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content };
+            });
+
+            const awaitFiles = await Promise.all(constructFiles);
+
+            event.reply(awaitFiles);
         });
 
         BDIpc.on('editor-getSnippets', async (event) => {
@@ -61,6 +70,23 @@ export default class Editor extends Module {
         });
     }
 
+    resolveMode(fileName) {
+        if (!fileName.includes('.')) return 'text';
+        const ext = fileName.substr(fileName.lastIndexOf('.') + 1);
+        if (this.modes.hasOwnProperty(ext)) return this.modes[ext];
+        return 'text';
+    }
+
+    get modes() {
+        return {
+            'css': 'css',
+            'scss': 'scss',
+            'js': 'js',
+            'txt': 'text',
+            'json': 'json'
+        };
+    }
+
     /**
      * Opens an editor.
      * @return {Promise}

From 20561e2938e24db2748640c1e3dbebadd83c0d68 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 25 Feb 2019 12:10:00 +0200
Subject: [PATCH 40/69] Set type

---
 core/src/modules/editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index bb9384945..8f3615f56 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -40,7 +40,7 @@ export default class Editor extends Module {
 
             const constructFiles = files.map(async file => {
                 const content = await FileUtils.readFile(path.resolve(this.bd.config.getPath('data'), file));
-                return { name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content };
+                return { type: 'file', name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content };
             });
 
             const awaitFiles = await Promise.all(constructFiles);

From d02f894d4a5a0db24c955014e65be176be832616 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 25 Feb 2019 12:41:22 +0200
Subject: [PATCH 41/69] Style inject

---
 client/src/modules/editor.js |  6 ++++++
 core/src/modules/editor.js   | 16 ++++++++++++++++
 editor/src/Editor.vue        |  8 +++++++-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/client/src/modules/editor.js b/client/src/modules/editor.js
index 2f5a8e109..c41132155 100644
--- a/client/src/modules/editor.js
+++ b/client/src/modules/editor.js
@@ -9,6 +9,7 @@
 */
 
 import Module from './imodule';
+import { DOM } from 'ui';
 
 export default new class extends Module {
 
@@ -30,6 +31,11 @@ export default new class extends Module {
                 e.reply({ err: err.stack || err });
             }
         });
+
+        ipc.on('editor-injectStyle', (e, { id, style }) => {
+            DOM.injectStyle(style, `userstyle-${id}`);
+            e.reply('ok');
+        });
     }
 
     /**
diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index 8f3615f56..0588e93d7 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -14,6 +14,7 @@ import { BrowserWindow } from 'electron';
 import Module from './modulebase';
 import { WindowUtils, FileUtils } from './utils';
 import BDIpc from './bdipc';
+import sass from 'node-sass';
 
 export default class Editor extends Module {
 
@@ -68,6 +69,21 @@ export default class Editor extends Module {
             console.log(snippet);
             event.reply('ok');
         });
+
+        BDIpc.on('editor-injectStyle', async (event, { id, style }) => {
+            sass.render({ data: style }, (err, result) => {
+                if (err) {
+                    console.log(err);
+                    event.reply({ err });
+                    return;
+                }
+                const { css } = result;
+                (async () => {
+                    await this.sendToDiscord('editor-injectStyle', { id, style: css.toString() });
+                    event.reply('ok');
+                })();
+            });
+        });
     }
 
     resolveMode(fileName) {
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index b79261d2e..f35313fc3 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -22,7 +22,8 @@
                 :newFile="newFile"
                 :saveFile="saveFile"
                 :newSnippet="newSnippet"
-                :saveSnippet="saveSnippet" />
+                :saveSnippet="saveSnippet"
+                :injectStyle="injectStyle"/>
     </div>
 </template>
 
@@ -131,6 +132,11 @@
                 console.log(result);
             },
 
+            async injectStyle(item) {
+                const result = await ClientIPC.send('bd-editor-injectStyle', { id: item.name.split('.')[0], style: item.content });
+                return result;
+            },
+
             toggleaot() {
                 this.alwaysOnTop = !this.alwaysOnTop;
                 remote.getCurrentWindow().setAlwaysOnTop(this.alwaysOnTop);

From 1b6f3005f5fe9fe272161cbc6d777bb2056d6619 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 25 Feb 2019 13:01:46 +0200
Subject: [PATCH 42/69] No need to compile if not scss

---
 core/src/modules/editor.js | 8 +++++++-
 editor/src/Editor.vue      | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index 0588e93d7..fa3a0cf06 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -70,7 +70,13 @@ export default class Editor extends Module {
             event.reply('ok');
         });
 
-        BDIpc.on('editor-injectStyle', async (event, { id, style }) => {
+        BDIpc.on('editor-injectStyle', async (event, { id, style, mode }) => {
+            if (mode !== 'scss') {
+                await this.sendToDiscord('editor-injectStyle', { id, style });
+                event.reply('ok');
+                return;
+            }
+
             sass.render({ data: style }, (err, result) => {
                 if (err) {
                     console.log(err);
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index f35313fc3..6dd8f359e 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -133,7 +133,7 @@
             },
 
             async injectStyle(item) {
-                const result = await ClientIPC.send('bd-editor-injectStyle', { id: item.name.split('.')[0], style: item.content });
+                const result = await ClientIPC.send('bd-editor-injectStyle', { id: item.name.split('.')[0], style: item.content, mode: item.mode });
                 return result;
             },
 

From 109eb31aa5a32ca57aaec23afedb5c0e1ad4ef61 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 25 Feb 2019 17:56:56 +0200
Subject: [PATCH 43/69] custom css inject and file saved state

---
 client/src/modules/editor.js | 20 +++++++++++++++++++-
 core/src/main.js             |  5 +++++
 editor/src/Editor.vue        |  9 +++++++--
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/client/src/modules/editor.js b/client/src/modules/editor.js
index c41132155..34f9fdf31 100644
--- a/client/src/modules/editor.js
+++ b/client/src/modules/editor.js
@@ -22,6 +22,20 @@ export default new class extends Module {
         };
     }
 
+    initialize() {
+        super.initialize();
+        (async () => {
+            try {
+                // TODO this is temporary
+                const userScss = await this.send('readDataFile', 'user.scss');
+                const compiled = await this.send('compileSass', { data: userScss });
+                this.injectStyle('customcss', compiled.css.toString());
+            } catch (err) {
+                console.warn('SCSS Compilation error', err);
+            }
+        })();
+    }
+
     events(ipc) {
         ipc.on('editor-runScript', (e, script) => {
             try {
@@ -33,11 +47,15 @@ export default new class extends Module {
         });
 
         ipc.on('editor-injectStyle', (e, { id, style }) => {
-            DOM.injectStyle(style, `userstyle-${id}`);
+            this.injectStyle(id, style);
             e.reply('ok');
         });
     }
 
+    injectStyle(id, style) {
+        return DOM.injectStyle(style, `userstyle-${id}`);
+    }
+
     /**
      * Show editor, flashes if already visible.
      */
diff --git a/core/src/main.js b/core/src/main.js
index b5da09698..a74d3fa43 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -92,6 +92,11 @@ class Comms {
         BDIpc.on('bd-keytar-set', (event, { service, account, password }) => keytar.setPassword(service, account, password), true);
         BDIpc.on('bd-keytar-delete', (event, { service, account }) => keytar.deletePassword(service, account), true);
         BDIpc.on('bd-keytar-find-credentials', (event, { service }) => keytar.findCredentials(service), true);
+
+        BDIpc.on('bd-readDataFile', async (event, fileName) => {
+            const rf = await FileUtils.readFile(path.resolve(configProxy().getPath('data'), fileName));
+            event.reply(rf);
+        });
     }
 
     async send(channel, message) {
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index 6dd8f359e..c4342b29a 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -123,8 +123,13 @@
             },
 
             async saveFile(file) {
-                const result = await ClientIPC.send('bd-editor-saveFile', file);
-                console.log(result);
+                try {
+                    const result = await ClientIPC.send('bd-editor-saveFile', file);
+                    file.savedContent = file.content;
+                    file.saved = true;
+                } catch (err) {
+                    console.log(err);
+                }
             },
 
             async saveSnippet(snippet) {

From 5e977e8dc4b7a148c3b292a5129675c208601130 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Mon, 25 Feb 2019 18:05:51 +0200
Subject: [PATCH 44/69] Hoist user.scss

---
 core/src/modules/editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index fa3a0cf06..56392579f 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -41,7 +41,7 @@ export default class Editor extends Module {
 
             const constructFiles = files.map(async file => {
                 const content = await FileUtils.readFile(path.resolve(this.bd.config.getPath('data'), file));
-                return { type: 'file', name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content };
+                return { type: 'file', name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content, hoisted: file === 'user.scss' };
             });
 
             const awaitFiles = await Promise.all(constructFiles);

From 72b278de6efec118ef5769cc34772956537ffa26 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Tue, 26 Feb 2019 16:33:14 +0200
Subject: [PATCH 45/69] js should be javascript

---
 editor/src/Editor.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index c4342b29a..6f5dde824 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -38,7 +38,7 @@
     const modes = {
         'css': 'css',
         'scss': 'scss',
-        'js': 'js',
+        'js': 'javascript',
         'txt': 'text',
         'json': 'json'
     };

From 145d61fe5ef947bdaced61ad9b41f16fd36eb5e2 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Tue, 26 Feb 2019 18:32:06 +0200
Subject: [PATCH 46/69] Enable importing other files

---
 core/src/modules/editor.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index 56392579f..f01b69ece 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -77,6 +77,12 @@ export default class Editor extends Module {
                 return;
             }
 
+            style = style.split('\n').map(line => {
+                if (!line.startsWith('@import')) return line;
+                const filename = line.split(' ')[1].replace(/'|"|;/g, '');
+                return `@import '${path.resolve(this.bd.config.getPath('data'), filename).replace(/\\/g, '/')}';`;
+            }).join('\n');
+
             sass.render({ data: style }, (err, result) => {
                 if (err) {
                     console.log(err);
@@ -103,7 +109,7 @@ export default class Editor extends Module {
         return {
             'css': 'css',
             'scss': 'scss',
-            'js': 'js',
+            'js': 'javascript',
             'txt': 'text',
             'json': 'json'
         };

From 7e10de32cb19f5ecb50fda2865368049ded792d5 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Tue, 26 Feb 2019 19:54:13 +0200
Subject: [PATCH 47/69] add new paths and enable snippet import

---
 core/src/main.js           | 33 +++++++++++------
 core/src/modules/editor.js | 76 ++++++++++++++++++++++++++++----------
 2 files changed, 77 insertions(+), 32 deletions(-)

diff --git a/core/src/main.js b/core/src/main.js
index a74d3fa43..340e1e4df 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -207,10 +207,13 @@ export class BetterDiscord {
 
     async ensureDirectories() {
         await FileUtils.ensureDirectory(this.config.getPath('ext'));
+        await FileUtils.ensureDirectory(this.config.getPath('user'));
         await Promise.all([
             FileUtils.ensureDirectory(this.config.getPath('plugins')),
             FileUtils.ensureDirectory(this.config.getPath('themes')),
-            FileUtils.ensureDirectory(this.config.getPath('modules'))
+            FileUtils.ensureDirectory(this.config.getPath('modules')),
+            FileUtils.ensureDirectory(this.config.getPath('userfiles')),
+            FileUtils.ensureDirectory(this.config.getPath('snippets'))
         ]);
     }
 
@@ -253,17 +256,23 @@ export class BetterDiscord {
      * Add extra paths to config
      */
     extraPaths() {
-        const baseDataPath = path.resolve(this.config.getPath('data'), '..');
-        const extPath = path.resolve(baseDataPath, 'ext');
-        const pluginPath = path.resolve(extPath, 'plugins');
-        const themePath = path.resolve(extPath, 'themes');
-        const modulePath = path.resolve(extPath, 'modules');
-
-        this.config.addPath('base', baseDataPath);
-        this.config.addPath('ext', extPath);
-        this.config.addPath('plugins', pluginPath);
-        this.config.addPath('themes', themePath);
-        this.config.addPath('modules', modulePath);
+        const base = path.resolve(this.config.getPath('data'), '..');
+        const ext = path.resolve(base, 'ext');
+        const plugins = path.resolve(ext, 'plugins');
+        const themes = path.resolve(ext, 'themes');
+        const modules = path.resolve(ext, 'modules');
+        const user = path.resolve(this.config.getPath('data'), 'user');
+        const userfiles = path.resolve(user, 'files');
+        const snippets = path.resolve(user, 'snippets');
+
+        this.config.addPath('base', base);
+        this.config.addPath('ext', ext);
+        this.config.addPath('plugins', plugins);
+        this.config.addPath('themes', themes);
+        this.config.addPath('modules', modules);
+        this.config.addPath('user', user);
+        this.config.addPath('userfiles', userfiles);
+        this.config.addPath('snippets', snippets);
     }
 
     /**
diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index f01b69ece..32ab658ab 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -35,39 +35,59 @@ export default class Editor extends Module {
         });
 
         BDIpc.on('editor-getFiles', async (event) => {
-            const exclude = ['db.json', 'emotes.json', 'storage', 'user.settings.json', 'window.json'];
-            const listFiles = await FileUtils.listDirectory(this.bd.config.getPath('data'));
-            const files = listFiles.filter(file => !exclude.includes(file));
+            try {
+                const files = await FileUtils.listDirectory(this.bd.config.getPath('userfiles'));
 
-            const constructFiles = files.map(async file => {
-                const content = await FileUtils.readFile(path.resolve(this.bd.config.getPath('data'), file));
-                return { type: 'file', name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content, hoisted: file === 'user.scss' };
-            });
+                const constructFiles = files.map(async file => {
+                    const content = await FileUtils.readFile(path.resolve(this.bd.config.getPath('userfiles'), file));
+                    return { type: 'file', name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content, hoisted: file === 'user.scss' };
+                });
 
-            const awaitFiles = await Promise.all(constructFiles);
+                const awaitFiles = await Promise.all(constructFiles);
 
-            event.reply(awaitFiles);
+                event.reply(awaitFiles);
+            } catch (err) {
+                console.log(err);
+                event.reject({ err });
+            }
         });
 
         BDIpc.on('editor-getSnippets', async (event) => {
-            event.reply([
-                { type: 'snippet', name: 'test.js', content: '', savedContent: '', mode: 'javascript', saved: true }
-            ]);
+            try {
+                const files = await FileUtils.listDirectory(this.bd.config.getPath('snippets'));
+
+                const constructFiles = files.map(async file => {
+                    const content = await FileUtils.readFile(path.resolve(this.bd.config.getPath('snippets'), file));
+                    return { type: 'snippet', name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content };
+                });
+
+                const awaitFiles = await Promise.all(constructFiles);
+
+                event.reply(awaitFiles);
+            } catch (err) {
+                console.log(err);
+                event.reject({ err });
+            }
         });
 
         BDIpc.on('editor-saveFile', async (event, file) => {
             try {
-                await FileUtils.writeFile(path.resolve(this.bd.config.getPath('data'), file.name), file.content);
+                await FileUtils.writeFile(path.resolve(this.bd.config.getPath('userfiles'), file.name), file.content);
                 event.reply('ok');
             } catch (err) {
-                event.reply({ err });
+                console.log(err);
+                event.reject({ err });
             }
         });
 
         BDIpc.on('editor-saveSnippet', async (event, snippet) => {
-            // TODO not sure how to store snippets yet
-            console.log(snippet);
-            event.reply('ok');
+            try {
+                await FileUtils.writeFile(path.resolve(this.bd.config.getPath('snippets'), snippet.name), snippet.content);
+                event.reply('ok');
+            } catch (err) {
+                console.log(err);
+                event.reject({ err });
+            }
         });
 
         BDIpc.on('editor-injectStyle', async (event, { id, style, mode }) => {
@@ -77,11 +97,27 @@ export default class Editor extends Module {
                 return;
             }
 
-            style = style.split('\n').map(line => {
+            style = await Promise.all(style.split('\n').map(async(line) => {
                 if (!line.startsWith('@import')) return line;
                 const filename = line.split(' ')[1].replace(/'|"|;/g, '');
-                return `@import '${path.resolve(this.bd.config.getPath('data'), filename).replace(/\\/g, '/')}';`;
-            }).join('\n');
+                let filePath = path.resolve(this.bd.config.getPath('userfiles'), filename).replace(/\\/g, '/');
+
+                try {
+                    await FileUtils.fileExists(filePath);
+                } catch (err) {
+                    filePath = path.resolve(this.bd.config.getPath('snippets'), filename).replace(/\\/g, '/');
+                }
+
+                try {
+                    await FileUtils.fileExists(filePath);
+                } catch (err) {
+                    return `/*${filename}*/`;
+                }
+
+                return `@import '${filePath}';`;
+            }));
+
+            style = style.join('\n');
 
             sass.render({ data: style }, (err, result) => {
                 if (err) {

From c0765120e852371fd2e020255c1160fb0db67275 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Tue, 26 Feb 2019 20:18:33 +0200
Subject: [PATCH 48/69] Juggle paths and keep user.scss in data

---
 core/src/main.js           | 10 +++++-----
 core/src/modules/editor.js | 35 ++++++++++++++++++++++++-----------
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/core/src/main.js b/core/src/main.js
index 340e1e4df..034a591dc 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -207,7 +207,7 @@ export class BetterDiscord {
 
     async ensureDirectories() {
         await FileUtils.ensureDirectory(this.config.getPath('ext'));
-        await FileUtils.ensureDirectory(this.config.getPath('user'));
+        await FileUtils.ensureDirectory(this.config.getPath('userdata'));
         await Promise.all([
             FileUtils.ensureDirectory(this.config.getPath('plugins')),
             FileUtils.ensureDirectory(this.config.getPath('themes')),
@@ -257,20 +257,20 @@ export class BetterDiscord {
      */
     extraPaths() {
         const base = path.resolve(this.config.getPath('data'), '..');
+        const userdata = path.resolve(base, 'userdata');
         const ext = path.resolve(base, 'ext');
         const plugins = path.resolve(ext, 'plugins');
         const themes = path.resolve(ext, 'themes');
         const modules = path.resolve(ext, 'modules');
-        const user = path.resolve(this.config.getPath('data'), 'user');
-        const userfiles = path.resolve(user, 'files');
-        const snippets = path.resolve(user, 'snippets');
+        const userfiles = path.resolve(userdata, 'files');
+        const snippets = path.resolve(userdata, 'snippets');
 
         this.config.addPath('base', base);
         this.config.addPath('ext', ext);
         this.config.addPath('plugins', plugins);
         this.config.addPath('themes', themes);
         this.config.addPath('modules', modules);
-        this.config.addPath('user', user);
+        this.config.addPath('userdata', userdata);
         this.config.addPath('userfiles', userfiles);
         this.config.addPath('snippets', snippets);
     }
diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index 32ab658ab..d2dcc6f00 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -38,14 +38,25 @@ export default class Editor extends Module {
             try {
                 const files = await FileUtils.listDirectory(this.bd.config.getPath('userfiles'));
 
-                const constructFiles = files.map(async file => {
+                const constructFiles = await Promise.all(files.map(async file => {
                     const content = await FileUtils.readFile(path.resolve(this.bd.config.getPath('userfiles'), file));
-                    return { type: 'file', name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content, hoisted: file === 'user.scss' };
+                    return { type: 'file', name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content };
+                }));
+
+                const userscssPath = path.resolve(this.bd.config.getPath('data'), 'user.scss');
+                const userscss = await FileUtils.readFile(userscssPath);
+                constructFiles.push({
+                    caption: 'user',
+                    type: 'file',
+                    name: 'user.scss',
+                    saved: true,
+                    mode: 'scss',
+                    content: userscss,
+                    savedContent: userscss,
+                    hoisted: true
                 });
 
-                const awaitFiles = await Promise.all(constructFiles);
-
-                event.reply(awaitFiles);
+                event.reply(constructFiles);
             } catch (err) {
                 console.log(err);
                 event.reject({ err });
@@ -56,14 +67,12 @@ export default class Editor extends Module {
             try {
                 const files = await FileUtils.listDirectory(this.bd.config.getPath('snippets'));
 
-                const constructFiles = files.map(async file => {
+                const constructFiles = await Promise.all(files.map(async file => {
                     const content = await FileUtils.readFile(path.resolve(this.bd.config.getPath('snippets'), file));
                     return { type: 'snippet', name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content };
-                });
+                }));
 
-                const awaitFiles = await Promise.all(constructFiles);
-
-                event.reply(awaitFiles);
+                event.reply(constructFiles);
             } catch (err) {
                 console.log(err);
                 event.reject({ err });
@@ -71,8 +80,12 @@ export default class Editor extends Module {
         });
 
         BDIpc.on('editor-saveFile', async (event, file) => {
+            const filePath = (file.hoisted && file.name === 'user.scss') ?
+                path.resolve(this.bd.config.getPath('data'), 'user.scss') :
+                path.resolve(this.bd.config.getPath('userfiles'), file.name);
+
             try {
-                await FileUtils.writeFile(path.resolve(this.bd.config.getPath('userfiles'), file.name), file.content);
+                await FileUtils.writeFile(filePath, file.content);
                 event.reply('ok');
             } catch (err) {
                 console.log(err);

From 7e1c379fd3e003e8634cdb3aa1f521f648153ad0 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Tue, 26 Feb 2019 20:19:57 +0200
Subject: [PATCH 49/69] Set user.scss caption

---
 core/src/modules/editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index d2dcc6f00..be690bf19 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -46,7 +46,7 @@ export default class Editor extends Module {
                 const userscssPath = path.resolve(this.bd.config.getPath('data'), 'user.scss');
                 const userscss = await FileUtils.readFile(userscssPath);
                 constructFiles.push({
-                    caption: 'user',
+                    caption: 'userstyle',
                     type: 'file',
                     name: 'user.scss',
                     saved: true,

From 7489fd0aaf642aa8c37bfed9aff2761d319b8a56 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Tue, 26 Feb 2019 20:30:07 +0200
Subject: [PATCH 50/69] Titlebar buttons fix

---
 .gitignore                      | 1 +
 editor/src/styles/titlebar.scss | 9 +++++++--
 editor/src/styles/vars.scss     | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index b7f2ac85a..0a886e032 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ user.config.json
 /.vs
 /npm-debug.log
 /tests/ext/extensions
+/tests/userdata
diff --git a/editor/src/styles/titlebar.scss b/editor/src/styles/titlebar.scss
index b837087ab..c1bbaa6d1 100644
--- a/editor/src/styles/titlebar.scss
+++ b/editor/src/styles/titlebar.scss
@@ -28,12 +28,17 @@
         font-size: 15px;
     }
 
+    .flex-spacer {
+        flex-grow: 1;
+    }
+
     .controls {
         margin: 0 0 0 2px;
         font-size: 0;
 
         button {
             -webkit-app-region: no-drag;
+            outline: none !important;
             border-radius: 3px;
             width: 25px;
             font-size: 12px;
@@ -50,12 +55,12 @@
             margin: 0 0 0 4px;
 
             &:hover {
-                background: #44474e;
+                background: $bdGreen;
                 color: #FFF;
             }
 
             &.active {
-                background: #3a71c1;
+                background: $bdGreen;
             }
         }
     }
diff --git a/editor/src/styles/vars.scss b/editor/src/styles/vars.scss
index 202ab7087..b08506d0b 100644
--- a/editor/src/styles/vars.scss
+++ b/editor/src/styles/vars.scss
@@ -1,2 +1,3 @@
 $logoSmallGw: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkltYWdlIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDUxMiA1MTIiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDUxMiA1MTI7IiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGUgdHlwZT0idGV4dC9jc3MiPi5zdDB7ZGlzcGxheTpub25lO30uc3Qxe2Rpc3BsYXk6aW5saW5lO2ZpbGw6IzAyMDAzNTtzdHJva2U6IzAwMDAwMDtzdHJva2UtbWl0ZXJsaW1pdDoxMDt9LnN0MntmaWxsOiMzRUNDOUU7fS5zdDN7ZmlsbDojRkZGRkZGO308L3N0eWxlPjxnIGlkPSJMYXllcl8yIiBjbGFzcz0ic3QwIj48cmVjdCB4PSItNjQiIHk9Ii0zMiIgY2xhc3M9InN0MSIgd2lkdGg9IjYxOCIgaGVpZ2h0PSI1NzIiLz48L2c+PGcgaWQ9IkxheWVyXzEiIHhtbG5zOnZlY3Rvcm5hdG9yPSJodHRwOi8vdmVjdG9ybmF0b3IuaW8iPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik03MCwxOC44Yy0xMy43LDAtMjcuMywxMy43LTI3LjMsMjcuM3YyMzMuNkM0Mi43LDM5Ny43LDEzNy45LDQ5MywyNTYsNDkzYzI5LjcsMCw1OC02LjEsODMuNi0xN1YzNDEuNWMtMTksMjUuNi00OS4zLDQyLjItODMuNiw0Mi4yYy01Ny42LDAtMTA0LjEtNDYuNS0xMDQuMS0xMDQuMVY0Ni4xYzAtMTMuNy0xMy43LTI3LjMtMjcuMy0yNy4zSDcweiIvPjxwYXRoIGNsYXNzPSJzdDMiIGQ9Ik0zODcuNCwxOC44Yy0xMy43LDAtMjcuMywxMy43LTI3LjMsMjcuM3Y0Ny4zQzMyOS4zLDc2LjIsMjkzLjksNjYuMywyNTYsNjYuM2MtMjkuOCwwLTU3LjksNi4zLTgzLjYsMTcuM3YxMzQuMmMxOS0yNS42LDQ5LjMtNDIuMiw4My42LTQyLjJjNTcuNiwwLDEwNC4xLDQ2LjUsMTA0LjEsMTA0LjF2MTg2LjJjNjUuMi0zNi40LDEwOS4yLTEwNiwxMDkuMi0xODYuMlY0Ni4xYzAtMTguOC0xMy43LTI3LjMtMjcuMy0yNy4zSDM4Ny40eiIvPjwvZz48L3N2Zz4=);
 $bdicon: $logoSmallGw;
+$bdGreen: #3ecc9c;

From 9f6389845af2f10e387bf75bdafd1d33f9beb690 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Tue, 26 Feb 2019 22:24:05 +0200
Subject: [PATCH 51/69] add live update 5 seconds after last change

---
 core/src/modules/editor.js |  3 ++-
 editor/src/Editor.vue      | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index be690bf19..66e7ec030 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -53,7 +53,8 @@ export default class Editor extends Module {
                     mode: 'scss',
                     content: userscss,
                     savedContent: userscss,
-                    hoisted: true
+                    hoisted: true,
+                    liveUpdate: true
                 });
 
                 event.reply(constructFiles);
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index 6f5dde824..0617bb74f 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -23,7 +23,8 @@
                 :saveFile="saveFile"
                 :newSnippet="newSnippet"
                 :saveSnippet="saveSnippet"
-                :injectStyle="injectStyle"/>
+                :injectStyle="injectStyle"
+                :toggleLiveUpdate="toggleLiveUpdate"/>
     </div>
 </template>
 
@@ -71,6 +72,7 @@
                 this.snippets = await ClientIPC.send('bd-editor-getSnippets');
 
                 this.loading = false;
+                this.liveUpdateInternal = setInterval(this.liveUpdate, 1000);
             })();
         },
         methods: {
@@ -82,6 +84,13 @@
             updateContent(item, content) {
                 item.content = content;
                 item.saved = item.content === item.savedContent;
+
+                if (this.liveUpdateTimeout) clearTimeout(this.liveUpdateTimeout);
+                if (item.liveUpdateEnabled) {
+                    this.liveUpdateTimeout = setTimeout(() => {
+                        this.injectStyle(item);
+                    }, 5000);
+                }
             },
 
             async runScript(script) {
@@ -138,10 +147,16 @@
             },
 
             async injectStyle(item) {
+                if (item.content === '') return;
                 const result = await ClientIPC.send('bd-editor-injectStyle', { id: item.name.split('.')[0], style: item.content, mode: item.mode });
                 return result;
             },
 
+            toggleLiveUpdate(item) {
+                item.liveUpdateEnabled = !item.liveUpdateEnabled;
+                return item;
+            },
+
             toggleaot() {
                 this.alwaysOnTop = !this.alwaysOnTop;
                 remote.getCurrentWindow().setAlwaysOnTop(this.alwaysOnTop);

From 2b86f2d7410d27a3d697e6515f607cec034fddf7 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Wed, 27 Feb 2019 01:33:23 +0200
Subject: [PATCH 52/69] File watchers

---
 core/src/modules/editor.js | 49 ++++++++++++++++++++++++++++++++++++++
 editor/src/Editor.vue      | 19 +++++++++++++--
 2 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index 66e7ec030..02243d4ad 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -15,6 +15,7 @@ import Module from './modulebase';
 import { WindowUtils, FileUtils } from './utils';
 import BDIpc from './bdipc';
 import sass from 'node-sass';
+import chokidar from 'chokidar';
 
 export default class Editor extends Module {
 
@@ -23,6 +24,7 @@ export default class Editor extends Module {
         this.editorPath = path;
         this.bd = bd;
         this.initListeners();
+        this.initWatchers();
     }
 
     initListeners() {
@@ -148,6 +150,53 @@ export default class Editor extends Module {
         });
     }
 
+    initWatchers() {
+        this.fileWatcher = chokidar.watch(this.bd.config.getPath('userfiles'));
+        this.snippetWatcher = chokidar.watch(this.bd.config.getPath('snippets'));
+
+        this.fileWatcher.on('add', file => {
+            const fileName = path.basename(file);
+            try {
+                this.send('editor-addFile', {
+                    type: 'file',
+                    name: fileName,
+                    saved: true,
+                    mode: this.resolveMode(fileName),
+                    content: '',
+                    savedContent: ''
+                });
+            } catch (err) {}
+        });
+
+        this.fileWatcher.on('unlink', file => {
+            const fileName = path.basename(file);
+            try {
+                this.send('editor-remFile', { name: fileName });
+            } catch (err) {}
+        });
+
+        this.snippetWatcher.on('add', file => {
+            const fileName = path.basename(file);
+            try {
+                this.send('editor-addSnippet', {
+                    type: 'snippet',
+                    name: fileName,
+                    saved: true,
+                    mode: this.resolveMode(fileName),
+                    content: '',
+                    savedContent: ''
+                });
+            } catch (err) { }
+        });
+
+        this.snippetWatcher.on('unlink', file => {
+            const fileName = path.basename(file);
+            try {
+                this.send('editor-remSnippet', { name: fileName });
+            } catch (err) { }
+        });
+    }
+
     resolveMode(fileName) {
         if (!fileName.includes('.')) return 'text';
         const ext = fileName.substr(fileName.lastIndexOf('.') + 1);
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index 0617bb74f..b4731030d 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -63,8 +63,23 @@
         },
         components: { BDEdit },
         created() {
-            ClientIPC.on('bd-editor-addFile', (_, file) => this.addFile(file));
-            ClientIPC.on('bd-editor-addSnippet', (_, snippet) => this.addSnippet(snippet));
+            ClientIPC.on('bd-editor-addFile', (_, file) => {
+                if (this.files.find(f => f.name === file.name)) return;
+                this.addFile(file);
+            });
+
+            ClientIPC.on('bd-editor-remFile', (_, file) => {
+                this.files = this.files.filter(f => f.name !== file.name);
+            });
+
+            ClientIPC.on('bd-editor-addSnippet', (_, snippet) => {
+                if (this.snippets.find(s => s.name === snippet.name)) return;
+                this.addSnippet(snippet);
+            });
+
+            ClientIPC.on('bd-editor-remSnippet', (_, snippet) => {
+                this.snippets = this.snippets.filter(s => s.name !== snippet.name);
+            });
         },
         mounted() {
             (async () => {

From c3283c47f6ea45208bdbbe2e871207c771219b76 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Wed, 27 Feb 2019 08:10:04 +0200
Subject: [PATCH 53/69] Tons of smol things

---
 core/src/main.js           |  2 +-
 core/src/modules/editor.js | 50 +++++++++++++-------------------------
 editor/src/Editor.vue      | 45 ++++++++++++++++++++++++++++------
 3 files changed, 55 insertions(+), 42 deletions(-)

diff --git a/core/src/main.js b/core/src/main.js
index 034a591dc..109a0fba1 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -263,7 +263,7 @@ export class BetterDiscord {
         const themes = path.resolve(ext, 'themes');
         const modules = path.resolve(ext, 'modules');
         const userfiles = path.resolve(userdata, 'files');
-        const snippets = path.resolve(userdata, 'snippets');
+        const snippets = path.resolve(userdata, 'snippets.json');
 
         this.config.addPath('base', base);
         this.config.addPath('ext', ext);
diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index 02243d4ad..b08912eaf 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -41,8 +41,8 @@ export default class Editor extends Module {
                 const files = await FileUtils.listDirectory(this.bd.config.getPath('userfiles'));
 
                 const constructFiles = await Promise.all(files.map(async file => {
-                    const content = await FileUtils.readFile(path.resolve(this.bd.config.getPath('userfiles'), file));
-                    return { type: 'file', name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content };
+                    // const content = await FileUtils.readFile(path.resolve(this.bd.config.getPath('userfiles'), file));
+                    return { type: 'file', name: file, saved: true, mode: this.resolveMode(file), content: '', savedContent: '', read: false, changed: false };
                 }));
 
                 const userscssPath = path.resolve(this.bd.config.getPath('data'), 'user.scss');
@@ -56,7 +56,9 @@ export default class Editor extends Module {
                     content: userscss,
                     savedContent: userscss,
                     hoisted: true,
-                    liveUpdate: true
+                    liveUpdate: true,
+                    read: true,
+                    changed: false
                 });
 
                 event.reply(constructFiles);
@@ -68,17 +70,12 @@ export default class Editor extends Module {
 
         BDIpc.on('editor-getSnippets', async (event) => {
             try {
-                const files = await FileUtils.listDirectory(this.bd.config.getPath('snippets'));
-
-                const constructFiles = await Promise.all(files.map(async file => {
-                    const content = await FileUtils.readFile(path.resolve(this.bd.config.getPath('snippets'), file));
-                    return { type: 'snippet', name: file, saved: true, mode: this.resolveMode(file), content, savedContent: content };
-                }));
-
-                event.reply(constructFiles);
+                const snippets = await FileUtils.readJsonFromFile(this.bd.config.getPath('snippets'));
+                event.reply(snippets);
             } catch (err) {
                 console.log(err);
-                event.reject({ err });
+                event.reply([]);
+                return;
             }
         });
 
@@ -98,7 +95,7 @@ export default class Editor extends Module {
 
         BDIpc.on('editor-saveSnippet', async (event, snippet) => {
             try {
-                await FileUtils.writeFile(path.resolve(this.bd.config.getPath('snippets'), snippet.name), snippet.content);
+                await FileUtils.writeFile(this.bd.config.getPath('snippets'), JSON.stringify(snippet));
                 event.reply('ok');
             } catch (err) {
                 console.log(err);
@@ -148,11 +145,15 @@ export default class Editor extends Module {
                 })();
             });
         });
+
+        BDIpc.on('editor-readFile', async (event, file) => {
+            const content = await FileUtils.readFile(path.resolve(this.bd.config.getPath('userfiles'), file.name));
+            event.reply(content);
+        });
     }
 
     initWatchers() {
         this.fileWatcher = chokidar.watch(this.bd.config.getPath('userfiles'));
-        this.snippetWatcher = chokidar.watch(this.bd.config.getPath('snippets'));
 
         this.fileWatcher.on('add', file => {
             const fileName = path.basename(file);
@@ -175,25 +176,8 @@ export default class Editor extends Module {
             } catch (err) {}
         });
 
-        this.snippetWatcher.on('add', file => {
-            const fileName = path.basename(file);
-            try {
-                this.send('editor-addSnippet', {
-                    type: 'snippet',
-                    name: fileName,
-                    saved: true,
-                    mode: this.resolveMode(fileName),
-                    content: '',
-                    savedContent: ''
-                });
-            } catch (err) { }
-        });
-
-        this.snippetWatcher.on('unlink', file => {
-            const fileName = path.basename(file);
-            try {
-                this.send('editor-remSnippet', { name: fileName });
-            } catch (err) { }
+        this.fileWatcher.on('change', file => {
+            this.send('editor-fileChange', { name: path.basename(file) });
         });
     }
 
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index b4731030d..b74b5ea91 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -23,6 +23,8 @@
                 :saveFile="saveFile"
                 :newSnippet="newSnippet"
                 :saveSnippet="saveSnippet"
+                :readFile="readFile"
+                :readSnippet="readSnippet"
                 :injectStyle="injectStyle"
                 :toggleLiveUpdate="toggleLiveUpdate"/>
     </div>
@@ -34,6 +36,7 @@
     import { remote } from 'electron';
 
     import { BDEdit } from 'bdedit';
+import { FileUtils } from '../../core/src/modules/utils';
     ace.acequire = ace.require;
 
     const modes = {
@@ -58,7 +61,8 @@
                 snippets: [],
                 loading: true,
                 alwaysOnTop: false,
-                error: undefined
+                error: undefined,
+                lastSaved: undefined
             }
         },
         components: { BDEdit },
@@ -80,20 +84,29 @@
             ClientIPC.on('bd-editor-remSnippet', (_, snippet) => {
                 this.snippets = this.snippets.filter(s => s.name !== snippet.name);
             });
+
+            ClientIPC.on('bd-editor-fileChange', (_, file) => {
+                if (this.lastSaved && this.lastSaved.name === file.name) { // If we saved in our editor then don't trigger
+                    this.lastSaved = undefined;
+                    return;
+                }
+
+                const f = this.files.find(f => f.name === file.name);
+                if (f) f.changed = true;
+            });
         },
         mounted() {
             (async () => {
                 this.files = await ClientIPC.send('bd-editor-getFiles');
                 this.snippets = await ClientIPC.send('bd-editor-getSnippets');
-
                 this.loading = false;
-                this.liveUpdateInternal = setInterval(this.liveUpdate, 1000);
             })();
         },
         methods: {
             addFile(file) {
                 this.files.push(file);
             },
+
             addSnippet(snippet) { this.snippets.push(file) },
 
             updateContent(item, content) {
@@ -120,11 +133,11 @@
                 let iter = 0;
 
                 while (this.files.find(file => file.name === newName)) {
-                    newName = `${prefix}_${iter}`;
+                    newName = `${prefix.split('.')[0]}_${iter}.${prefix.split('.')[1]}`;
                     iter++;
                 }
 
-                const newItem = { type: 'file', name: newName, content: '', mode, saved: false };
+                const newItem = { type: 'file', name: newName, content: '', mode, saved: false, read: true };
                 this.files.push(newItem);
                 return newItem;
             },
@@ -141,13 +154,14 @@
                     iter++;
                 }
 
-                const newItem = { type: 'snippet', name: newName, content: '', mode, saved: false };
+                const newItem = { type: 'snippet', name: newName, content: '', savedContent: '', mode, saved: false, read: true };
                 this.snippets.push(newItem);
                 return newItem;
             },
 
             async saveFile(file) {
                 try {
+                    this.lastSaved = file;
                     const result = await ClientIPC.send('bd-editor-saveFile', file);
                     file.savedContent = file.content;
                     file.saved = true;
@@ -157,8 +171,23 @@
             },
 
             async saveSnippet(snippet) {
-                const result = await ClientIPC.send('bd-editor-saveSnippet', snippet);
-                console.log(result);
+                // TODO only saved snippets should save not all when one is saved.
+                snippet.saved = true;
+                const result = await ClientIPC.send('bd-editor-saveSnippet', this.snippets);
+            },
+
+            async readFile(file) {
+                const content = await ClientIPC.send('editor-readFile', file);
+                file.read = true;
+                file.changed = false;
+                file.content = file.savedContent = content;
+                return content;
+            },
+
+            async readSnippet(snippet) {
+                const content = await ClientIPC.send('editor-readSnippet', snippet);
+                snippet.read = true;
+                return content;
             },
 
             async injectStyle(item) {

From d8f977b57abd8f7d7f3a0b948e7c887fdd355e09 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Wed, 27 Feb 2019 16:43:13 +0200
Subject: [PATCH 54/69] Not a dir anymore

---
 core/src/main.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/src/main.js b/core/src/main.js
index 109a0fba1..f0e69aab8 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -212,8 +212,7 @@ export class BetterDiscord {
             FileUtils.ensureDirectory(this.config.getPath('plugins')),
             FileUtils.ensureDirectory(this.config.getPath('themes')),
             FileUtils.ensureDirectory(this.config.getPath('modules')),
-            FileUtils.ensureDirectory(this.config.getPath('userfiles')),
-            FileUtils.ensureDirectory(this.config.getPath('snippets'))
+            FileUtils.ensureDirectory(this.config.getPath('userfiles'))
         ]);
     }
 

From ac9e16632d894f01c2c04071e015d3a4305240b5 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Wed, 27 Feb 2019 20:34:11 +0200
Subject: [PATCH 55/69] Snippet save/load

---
 core/src/modules/editor.js | 22 +++++++++++++---------
 editor/src/Editor.vue      |  9 ++++++++-
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index b08912eaf..df7837abb 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -71,7 +71,17 @@ export default class Editor extends Module {
         BDIpc.on('editor-getSnippets', async (event) => {
             try {
                 const snippets = await FileUtils.readJsonFromFile(this.bd.config.getPath('snippets'));
-                event.reply(snippets);
+                event.reply(snippets.map(snippet => {
+                    return {
+                        type: 'snippet',
+                        name: snippet.name,
+                        mode: this.resolveMode(snippet.name),
+                        content: snippet.content,
+                        savedContent: snippet.content,
+                        read: true,
+                        saved: true
+                    }
+                }));
             } catch (err) {
                 console.log(err);
                 event.reply([]);
@@ -113,18 +123,12 @@ export default class Editor extends Module {
             style = await Promise.all(style.split('\n').map(async(line) => {
                 if (!line.startsWith('@import')) return line;
                 const filename = line.split(' ')[1].replace(/'|"|;/g, '');
-                let filePath = path.resolve(this.bd.config.getPath('userfiles'), filename).replace(/\\/g, '/');
-
-                try {
-                    await FileUtils.fileExists(filePath);
-                } catch (err) {
-                    filePath = path.resolve(this.bd.config.getPath('snippets'), filename).replace(/\\/g, '/');
-                }
+                const filePath = path.resolve(this.bd.config.getPath('userfiles'), filename).replace(/\\/g, '/');
 
                 try {
                     await FileUtils.fileExists(filePath);
                 } catch (err) {
-                    return `/*${filename}*/`;
+                    `/*${filename}*/`;
                 }
 
                 return `@import '${filePath}';`;
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index b74b5ea91..04f82ae40 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -173,7 +173,14 @@ import { FileUtils } from '../../core/src/modules/utils';
             async saveSnippet(snippet) {
                 // TODO only saved snippets should save not all when one is saved.
                 snippet.saved = true;
-                const result = await ClientIPC.send('bd-editor-saveSnippet', this.snippets);
+                snippet.savedContent = snippet.content;
+                const result = await ClientIPC.send('bd-editor-saveSnippet', this.snippets.map(snippet => {
+                    return {
+                        name: snippet.name,
+                        content: snippet.savedContent
+                    }
+                }));
+                console.log(result);
             },
 
             async readFile(file) {

From b1e8b591ba84e666296195ac34916740cf7d7efd Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Wed, 27 Feb 2019 20:34:31 +0200
Subject: [PATCH 56/69] Remove todo

---
 editor/src/Editor.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index 04f82ae40..5d1b1c114 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -171,7 +171,6 @@ import { FileUtils } from '../../core/src/modules/utils';
             },
 
             async saveSnippet(snippet) {
-                // TODO only saved snippets should save not all when one is saved.
                 snippet.saved = true;
                 snippet.savedContent = snippet.content;
                 const result = await ClientIPC.send('bd-editor-saveSnippet', this.snippets.map(snippet => {
@@ -180,7 +179,6 @@ import { FileUtils } from '../../core/src/modules/utils';
                         content: snippet.savedContent
                     }
                 }));
-                console.log(result);
             },
 
             async readFile(file) {

From 99ec82795ca43618ffedd25cb1ab002cca230820 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 28 Feb 2019 06:05:54 +0200
Subject: [PATCH 57/69] reveal, copy and copypath handlers

---
 core/src/main.js      | 17 ++++++++++++++++-
 editor/src/Editor.vue | 41 ++++++++++++++++++++++++++++-------------
 2 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/core/src/main.js b/core/src/main.js
index f0e69aab8..204255ec3 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -30,7 +30,7 @@ const TEST_EDITOR = true;
 
 import path from 'path';
 import sass from 'node-sass';
-import { BrowserWindow as OriginalBrowserWindow, dialog, session } from 'electron';
+import { BrowserWindow as OriginalBrowserWindow, dialog, session, shell } from 'electron';
 import deepmerge from 'deepmerge';
 import ContentSecurityPolicy from 'csp-parse';
 import keytar from 'keytar';
@@ -97,6 +97,21 @@ class Comms {
             const rf = await FileUtils.readFile(path.resolve(configProxy().getPath('data'), fileName));
             event.reply(rf);
         });
+
+        BDIpc.on('bd-explorer', (_, _path) => {
+            if (_path.static) _path = this.bd.config.getPath(_path.static);
+            else if (_path.full) _path = _path.full;
+            else if (_path.sub) _path = path.resolve(this.bd.config.getPath(_path.sub.base), [..._path.sub.subs]);
+            try {
+                shell.openItem(_path);
+            } catch (err) {
+                console.log(err);
+            }
+        });
+
+        BDIpc.on('bd-getPath', (event, paths) => {
+            event.reply(path.resolve(this.bd.config.getPath(paths[0]), ...paths.splice(1)));
+        });
     }
 
     async send(channel, message) {
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index 5d1b1c114..f8d325ad7 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -12,10 +12,8 @@
                 <button title="Close CSS Editor" @click="close">X</button>
             </div>
         </div>
-        <div id="spinner" v-if="loading">
-            <div class="valign">Loading Please Wait...</div>
-        </div>
-        <BDEdit v-else :files="files"
+        <BDEdit :files="files"
+                :parentLoading="loading"
                 :snippets="snippets"
                 :updateContent="updateContent"
                 :runScript="runScript"
@@ -26,17 +24,18 @@
                 :readFile="readFile"
                 :readSnippet="readSnippet"
                 :injectStyle="injectStyle"
-                :toggleLiveUpdate="toggleLiveUpdate"/>
+                :toggleLiveUpdate="toggleLiveUpdate"
+                :ctxAction="ctxAction"/>
     </div>
 </template>
 
 <script>
-
     import { ClientIPC } from 'common';
     import { remote } from 'electron';
 
     import { BDEdit } from 'bdedit';
-import { FileUtils } from '../../core/src/modules/utils';
+    import { FileUtils } from '../../core/src/modules/utils';
+    import { setTimeout } from 'timers';
     ace.acequire = ace.require;
 
     const modes = {
@@ -95,12 +94,10 @@ import { FileUtils } from '../../core/src/modules/utils';
                 if (f) f.changed = true;
             });
         },
-        mounted() {
-            (async () => {
-                this.files = await ClientIPC.send('bd-editor-getFiles');
-                this.snippets = await ClientIPC.send('bd-editor-getSnippets');
-                this.loading = false;
-            })();
+        async mounted() {
+            this.files = await ClientIPC.send('bd-editor-getFiles');
+            this.snippets = await ClientIPC.send('bd-editor-getSnippets');
+            this.loading = false;
         },
         methods: {
             addFile(file) {
@@ -201,6 +198,24 @@ import { FileUtils } from '../../core/src/modules/utils';
                 return result;
             },
 
+            async ctxAction(action, item) {
+                if (action === 'reveal') {
+                    ClientIPC.send('explorer', { 'static': 'userfiles' });
+                    return;
+                }
+
+                if (action === 'copy') {
+                    remote.clipboard.writeText(item.content);
+                    return;
+                }
+
+                if (action === 'copyPath') {
+                    const fullPath = await ClientIPC.send('getPath', ['userfiles', item.name]);
+                    remote.clipboard.writeText(fullPath);
+                    return;
+                }
+            },
+
             toggleLiveUpdate(item) {
                 item.liveUpdateEnabled = !item.liveUpdateEnabled;
                 return item;

From 6030a78b919153671075dd3dd05ac82e0d18d717 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 28 Feb 2019 06:40:33 +0200
Subject: [PATCH 58/69] Delete and rename handlers

---
 core/src/main.js          | 22 ++++++++++++++++++++++
 core/src/modules/utils.js | 22 ++++++++++++++++++++++
 editor/src/Editor.vue     | 27 +++++++++++++++++++++++++++
 3 files changed, 71 insertions(+)

diff --git a/core/src/main.js b/core/src/main.js
index 204255ec3..6a6eab7d6 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -112,6 +112,28 @@ class Comms {
         BDIpc.on('bd-getPath', (event, paths) => {
             event.reply(path.resolve(this.bd.config.getPath(paths[0]), ...paths.splice(1)));
         });
+
+        BDIpc.on('bd-rmFile', async (event, paths) => {
+            const fullPath = path.resolve(this.bd.config.getPath(paths[0]), ...paths.splice(1));
+            try {
+                await FileUtils.rm(fullPath);
+                event.reply('ok');
+            } catch (err) {
+                event.reject(err);
+            }
+        });
+
+        BDIpc.on('bd-rnFile', async (event, paths) => {
+            const oldPath = path.resolve(this.bd.config.getPath(paths.oldName[0]), ...paths.oldName.splice(1));
+            const newPath = path.resolve(this.bd.config.getPath(paths.newName[0]), ...paths.newName.splice(1));
+
+            try {
+                await FileUtils.rn(oldPath, newPath);
+                event.reply('ok');
+            } catch (err) {
+                event.reject(err);
+            }
+        });
     }
 
     async send(channel, message) {
diff --git a/core/src/modules/utils.js b/core/src/modules/utils.js
index 4dd062e27..66586e7fc 100644
--- a/core/src/modules/utils.js
+++ b/core/src/modules/utils.js
@@ -11,6 +11,7 @@
 // TODO Use common
 
 import fs from 'fs';
+import rimraf from 'rimraf';
 
 import Module from './modulebase';
 import BDIpc from './bdipc';
@@ -164,6 +165,27 @@ export class FileUtils {
             }
         }
     }
+
+    static async rm(path) {
+        return new Promise((resolve, reject) => {
+            rimraf(path, err => {
+                if (err) {
+                    console.log(err);
+                    reject(err);
+                }
+                resolve();
+            });
+        });
+    }
+
+    static async rn(oldPath, newPath) {
+        return new Promise((resolve, reject) => {
+            fs.rename(oldPath, newPath, err => {
+                if (err) return reject(err);
+                resolve();
+            });
+        });
+    }
 }
 
 export class WindowUtils extends Module {
diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index f8d325ad7..54b7d05f9 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -214,6 +214,33 @@
                     remote.clipboard.writeText(fullPath);
                     return;
                 }
+
+                if (action === 'rename') { // TODO select correct file after
+                    this.loading = true;
+                    const { oldName, newName } = item;
+
+                    try {
+                        await ClientIPC.send('rnFile', { oldName: ['userfiles', oldName], newName: ['userfiles', newName] });
+                    } catch (err) {
+                        console.log(err);
+                    } finally {
+                        this.loading = false;
+                    }
+
+                    return;
+                }
+
+                if (action === 'delete') {
+                    this.loading = true;
+                    try {
+                        await ClientIPC.send('rmFile', ['userfiles', item.name]);
+                    } catch (err) {
+                        console.log(err);
+                    } finally {
+                        this.loading = false;
+                    }
+                    return;
+                }
             },
 
             toggleLiveUpdate(item) {

From db89e3a1a0f2b863b618ed3a7f2a91f6d02f2009 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 28 Feb 2019 09:45:06 +0200
Subject: [PATCH 59/69] sass doesn't like empty

---
 editor/src/Editor.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index 54b7d05f9..c33635a70 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -193,8 +193,8 @@
             },
 
             async injectStyle(item) {
-                if (item.content === '') return;
-                const result = await ClientIPC.send('bd-editor-injectStyle', { id: item.name.split('.')[0], style: item.content, mode: item.mode });
+                const style = item.content.length <= 0 ? ' ' : item.content;
+                const result = await ClientIPC.send('bd-editor-injectStyle', { id: item.name.split('.')[0], style, mode: item.mode });
                 return result;
             },
 

From 806ca5028a7ace9259418f201a62521707578ff7 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 28 Feb 2019 09:46:24 +0200
Subject: [PATCH 60/69] auto imports

---
 editor/src/Editor.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index c33635a70..68336b183 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -34,8 +34,7 @@
     import { remote } from 'electron';
 
     import { BDEdit } from 'bdedit';
-    import { FileUtils } from '../../core/src/modules/utils';
-    import { setTimeout } from 'timers';
+
     ace.acequire = ace.require;
 
     const modes = {

From 97519b2307d21277151a1276e64d41476a894525 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 28 Feb 2019 09:48:45 +0200
Subject: [PATCH 61/69] lint

---
 client/src/modules/imodule.js | 2 +-
 package.json                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/modules/imodule.js b/client/src/modules/imodule.js
index 88742d08e..b16b9ee85 100644
--- a/client/src/modules/imodule.js
+++ b/client/src/modules/imodule.js
@@ -22,7 +22,7 @@ export default class Module {
             args
         };
         this.setState = this.setState.bind(this);
-        
+
         if (this.delay) { // If delay is set then module is set to load delayed from modulemanager
             this.initialize = this.initialize.bind(this);
             this.init = this.initialize;
diff --git a/package.json b/package.json
index de2c3eee2..8443563d0 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "watch_csseditor": "npm run watch --prefix csseditor",
     "build_editor": "npm run build --prefix editor",
     "watch_editor": "npm run watch --prefix editor",
-    "lint": "eslint -f unix client/src core/src csseditor/src common && npm run sasslint",
+    "lint": "eslint -f unix client/src core/src editor/src common && npm run sasslint",
     "lint_fix": "eslint -f unix client/src core/src csseditor/src common --fix",
     "sasslint": "sass-lint client/src/styles/**/*.scss -v",
     "test": "npm run build && npm run lint",

From 9773f78506b466e89092122fa891a6ad940fb486 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 28 Feb 2019 12:37:57 +0200
Subject: [PATCH 62/69] Toasts and name conflict handler

---
 editor/src/Editor.vue | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/editor/src/Editor.vue b/editor/src/Editor.vue
index 68336b183..aea6acf13 100644
--- a/editor/src/Editor.vue
+++ b/editor/src/Editor.vue
@@ -25,7 +25,8 @@
                 :readSnippet="readSnippet"
                 :injectStyle="injectStyle"
                 :toggleLiveUpdate="toggleLiveUpdate"
-                :ctxAction="ctxAction"/>
+                :ctxAction="ctxAction"
+                :toast="toast"/>
     </div>
 </template>
 
@@ -60,7 +61,8 @@
                 loading: true,
                 alwaysOnTop: false,
                 error: undefined,
-                lastSaved: undefined
+                lastSaved: undefined,
+                toast: { active: false, msg: '' }
             }
         },
         components: { BDEdit },
@@ -218,15 +220,23 @@
                     this.loading = true;
                     const { oldName, newName } = item;
 
+                    if (this.files.find(f => f.name === newName)) {
+                        this.loading = false;
+                        this.showToast('err', `File ${newName} already exists`);
+                        return {
+                            err: `File ${newName} already exists`
+                        };
+                    }
+
                     try {
                         await ClientIPC.send('rnFile', { oldName: ['userfiles', oldName], newName: ['userfiles', newName] });
+                        return item;
                     } catch (err) {
                         console.log(err);
+                        return { err };
                     } finally {
                         this.loading = false;
                     }
-
-                    return;
                 }
 
                 if (action === 'delete') {
@@ -242,6 +252,11 @@
                 }
             },
 
+            showToast(type, msg, timeout = 3000) {
+                this.toast = { active: true, type, msg };
+                setTimeout(() => { this.toast.active = false }, timeout);
+            },
+
             toggleLiveUpdate(item) {
                 item.liveUpdateEnabled = !item.liveUpdateEnabled;
                 return item;

From d75b907ae41cdf37b2505c55e050d90a591a4644 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 28 Feb 2019 15:10:34 +0200
Subject: [PATCH 63/69] ensure user.scss exists

---
 core/src/modules/editor.js |  3 +++
 core/src/modules/utils.js  | 14 ++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index df7837abb..1e7860cba 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -46,6 +46,9 @@ export default class Editor extends Module {
                 }));
 
                 const userscssPath = path.resolve(this.bd.config.getPath('data'), 'user.scss');
+
+                await FileUtils.ensureFile(userscssPath);
+
                 const userscss = await FileUtils.readFile(userscssPath);
                 constructFiles.push({
                     caption: 'userstyle',
diff --git a/core/src/modules/utils.js b/core/src/modules/utils.js
index 66586e7fc..bb0710237 100644
--- a/core/src/modules/utils.js
+++ b/core/src/modules/utils.js
@@ -85,6 +85,20 @@ export class FileUtils {
         });
     }
 
+    static async ensureFile(path) {
+        try {
+            await this.fileExists(path);
+            return true;
+        } catch (err) {
+            try {
+                await this.writeFile(path, '');
+                return true;
+            } catch (err) {
+                throw err;
+            }
+        }
+    }
+
     static async readJsonFromFile(path) {
         let readFile;
         try {

From 665a7818c9b6a5581171b8c9aa930e51de51c850 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 28 Feb 2019 15:12:17 +0200
Subject: [PATCH 64/69] Make sure editor path is set

---
 core/src/main.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main.js b/core/src/main.js
index 6a6eab7d6..58cbfa665 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -309,6 +309,7 @@ export class BetterDiscord {
         this.config.addPath('userdata', userdata);
         this.config.addPath('userfiles', userfiles);
         this.config.addPath('snippets', snippets);
+        if (!this.config.getPath('editor')) this.config.addPath('editor', path.resolve(base, 'editor'));
     }
 
     /**

From dd11708f9f7413d0beea55d60bb696a5d52a8dfe Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 28 Feb 2019 15:20:36 +0200
Subject: [PATCH 65/69] return null if no path

---
 core/src/modules/config.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/modules/config.js b/core/src/modules/config.js
index 2de5839d1..c81ba5def 100644
--- a/core/src/modules/config.js
+++ b/core/src/modules/config.js
@@ -30,6 +30,7 @@ export default class Config extends Module {
 
     getPath(id, full) {
         const path = this.paths.find(p => p.id === id);
+        if (!path) return null;
         return full ? path : path.path;
     }
 

From d98cff878f56d8e23bca2e466f9253727ab7b2fe Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 28 Feb 2019 16:47:49 +0200
Subject: [PATCH 66/69] uglify editor

---
 editor/webpack.production.config.js | 43 +++++++++++++++++++++++++++++
 package.json                        |  2 +-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 editor/webpack.production.config.js

diff --git a/editor/webpack.production.config.js b/editor/webpack.production.config.js
new file mode 100644
index 000000000..39c2c3129
--- /dev/null
+++ b/editor/webpack.production.config.js
@@ -0,0 +1,43 @@
+const path = require('path');
+const webpack = require('webpack');
+const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
+
+const vueLoader = {
+    test: /\.(vue)$/,
+    exclude: /node_modules/,
+    loader: 'vue-loader'
+};
+
+const scssLoader = {
+    test: /\.(css|scss)$/,
+    loader: ['css-loader', 'sass-loader']
+};
+
+module.exports = {
+    entry: './src/index.js',
+    output: {
+        path: path.resolve(__dirname, 'dist'),
+        filename: 'editor_release.js'
+    },
+    module: {
+        loaders: [vueLoader, scssLoader]
+    },
+    externals: {
+        electron: 'window.require("electron")',
+        fs: 'window.require("fs")',
+        util: 'window.require("util")',
+        process: 'require("process")'
+    },
+    resolve: {
+        alias: {
+            vue$: path.resolve('..', 'node_modules', 'vue', 'dist', 'vue.esm.js')
+        },
+        modules: [
+            path.resolve('..', 'node_modules'),
+            path.resolve('..', 'common', 'modules')
+        ]
+    },
+    plugins: [
+        new UglifyJsPlugin()
+    ]
+};
diff --git a/package.json b/package.json
index 8443563d0..404c8aaa8 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "sasslint": "sass-lint client/src/styles/**/*.scss -v",
     "test": "npm run build && npm run lint",
     "build_node-sass": "node scripts/build-node-sass.js",
-    "build_release": "npm run release --prefix client && npm run build --prefix core && npm run release --prefix csseditor",
+    "build_release": "npm run release --prefix client && npm run build --prefix core && npm run release --prefix editor",
     "package_release": "node scripts/package-release.js",
     "gulp_release": "gulp release",
     "release": "npm run lint && npm run build_release && gulp release && npm run package_release",

From 1ea307efdda41a898fa13f17195e2d5472778ab5 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 28 Feb 2019 16:51:45 +0200
Subject: [PATCH 67/69] Editor release build

---
 editor/webpack.production.config.js |  2 +-
 gulpfile.babel.js                   | 27 +++++++++++++++++++++------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/editor/webpack.production.config.js b/editor/webpack.production.config.js
index 39c2c3129..43bf0707b 100644
--- a/editor/webpack.production.config.js
+++ b/editor/webpack.production.config.js
@@ -17,7 +17,7 @@ module.exports = {
     entry: './src/index.js',
     output: {
         path: path.resolve(__dirname, 'dist'),
-        filename: 'editor_release.js'
+        filename: 'editor.release.js'
     },
     module: {
         loaders: [vueLoader, scssLoader]
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 78ad58dc1..9993c78cb 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -10,6 +10,7 @@ import editjson from 'gulp-json-editor';
 
 import corepkg from './core/package';
 import clientpkg from './client/package';
+import editorpkg from './editor/package';
 
 // core-release >
 
@@ -84,16 +85,30 @@ gulp.task('client-sparkplug', function () {
 
 gulp.task('client-release', gulp.parallel('client-main', 'client-pkg', 'client-sparkplug'));
 
-// CSS Editor
+// Editor
 
-gulp.task('css-editor', function () {
+gulp.task('editor-main', function () {
     return pump([
-        gulp.src('csseditor/dist/csseditor-release.js'),
-        rename('csseditor.js'),
-        gulp.dest('release/csseditor')
+        gulp.src('editor/dist/editor.release.js'),
+        rename(`editor.${editorpkg.version}.js`),
+        gulp.dest('release/editor')
     ]);
 });
 
+gulp.task('editor-pkg', function () {
+    return pump([
+        gulp.src('editor/package.json'),
+        editjson(function (pkg) {
+            pkg.main = `editor.${editorpkg.version}.js`;
+            delete pkg.scripts;
+            return pkg;
+        }),
+        gulp.dest('release/editor')
+    ]);
+});
+
+gulp.task('editor-release', gulp.parallel('editor-main', 'editor-pkg'));
+
 // Deps
 
 gulp.task('node-modules', function () {
@@ -125,5 +140,5 @@ gulp.task('del-release', function() {
 });
 
 gulp.task('dependencies', gulp.series('node-modules', gulp.parallel('node-sass-bindings', 'keytar-bindings')));
-gulp.task('build-release', gulp.parallel('core-release', 'client-release', 'dependencies'));
+gulp.task('build-release', gulp.parallel('core-release', 'client-release', 'editor-release', 'dependencies'));
 gulp.task('release', gulp.series('del-release', 'build-release'));

From b22923d12f386bdf4ed9690ce41f76387fa82e7e Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 28 Feb 2019 17:00:25 +0200
Subject: [PATCH 68/69] editor packaging

---
 scripts/package-release.js | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/scripts/package-release.js b/scripts/package-release.js
index c4e7c033b..d6bbbbe67 100644
--- a/scripts/package-release.js
+++ b/scripts/package-release.js
@@ -15,7 +15,7 @@ releaseStub.files = releaseStub.files.map(file => {
 const mainpkg = require('../package.json');
 const corepkg = require('../release/core/package.json');
 const clientpkg = require('../release/client/package.json');
-// const editorpkg = require('../release/editor/package.json');
+const editorpkg = require('../release/editor/package.json');
 
 const createArchiver = (level = 1) => {
     return archiver('tar', {
@@ -85,6 +85,23 @@ async function archiveClient(out = './release/client.tar.gz') {
     });
 }
 
+// Editor
+async function archiveEditor(out = './release/editor.tar.gz') {
+    return new Promise((resolve, reject) => {
+        console.log('packaging editor');
+        const mainFn = `editor.${editorpkg.version}.js`;
+        const editorArchive = createArchiver();
+        editorArchive.directory('./release/editor', 'editor');
+
+        const editorZipStream = fs.createWriteStream(out);
+        editorArchive.pipe(editorZipStream);
+
+        editorArchive.on('end', () => resolve(out));
+        editorArchive.on('error', reject);
+        editorArchive.finalize();
+    });
+}
+
 async function pack() {
     const coreArchive = await archiveCore();
     const coreHash = await hashFile(coreArchive);
@@ -110,11 +127,24 @@ async function pack() {
     clientStub.size = clientSize;
     clientStub.remote = clientStub.remote.replace(':fn', 'client.tar.gz');
 
+    const editorArchive = await archiveEditor();
+    const editorHash = await hashFile(editorArchive);
+    const editorSize = await fileSize(editorArchive);
+    console.log(`${editorArchive} ${editorSize} | ${editorHash}`);
+
+    const editorStub = releaseStub.files.find(f => f.id === 'editor');
+    editorStub.name = 'editor.tar.gz';
+    editorStub.version = editorpkg.version;
+    editorStub.hash = editorHash;
+    editorStub.size = editorSize;
+    editorStub.remote = editorStub.remote.replace(':fn', 'editor.tar.gz');
+
     releaseStub.mver = mainpkg.version;
     releaseStub.files = [
         releaseStub.files.find(f => f.id === 'stub'),
         coreStub,
-        clientStub
+        clientStub,
+        editorStub
     ];
 
     fs.writeFile('./release/releaseinfo.json', JSON.stringify(releaseStub, null, 4), (err) => {

From b8d16c6e4ddf0fdcc75c3474631a7660b670d2f1 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Thu, 28 Feb 2019 17:07:53 +0200
Subject: [PATCH 69/69] Load correct editor file

---
 core/src/modules/editor.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/src/modules/editor.js b/core/src/modules/editor.js
index 1e7860cba..4ee55e6e2 100644
--- a/core/src/modules/editor.js
+++ b/core/src/modules/editor.js
@@ -209,7 +209,13 @@ export default class Editor extends Module {
      * Opens an editor.
      * @return {Promise}
      */
-    openEditor(options) {
+    async openEditor(options) {
+        if (!this.editorPkg) {
+            this.editorPkg = await FileUtils.readJsonFromFile(path.join(this.editorPath, 'package.json'));
+        }
+
+        console.log(this.editorPkg);
+
         return new Promise((resolve, reject) => {
             if (this.editor) {
                 if (this.editor.isFocused()) return;
@@ -236,7 +242,7 @@ export default class Editor extends Module {
             });
 
             this.editor.webContents.on('did-finish-load', () => {
-                this.editorUtils.injectScript(path.join(this.editorPath, 'editor.js'));
+                this.editorUtils.injectScript(path.join(this.editorPath, this.editorPkg.main));
                 resolve(true);
             });
         })