From 86eab34758ebe41a7b923f909bef4b22a451cee0 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Mon, 8 Jan 2018 12:29:43 -0800
Subject: [PATCH] type-operator-spacing: Just check for presence of space, not
 double-space (#20817)

---
 package-lock.json                             | 1322 +++++++----------
 .../tslint/rules/typeOperatorSpacingRule.ts   |   30 +-
 src/services/shims.ts                         |    2 -
 3 files changed, 510 insertions(+), 844 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4a071afa0f5..736551168ae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,13 +4,30 @@
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
+        "@browserify/acorn5-object-spread": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/@browserify/acorn5-object-spread/-/acorn5-object-spread-5.0.1.tgz",
+            "integrity": "sha512-sFCUPzgeEjdq3rinwy4TFXtak2YZdhqpj6MdNusxkdTFr9TXAUEYK4YQSamR8Joqt/yii1drgl5hk8q/AtJDKA==",
+            "dev": true,
+            "requires": {
+                "acorn": "5.3.0"
+            },
+            "dependencies": {
+                "acorn": {
+                    "version": "5.3.0",
+                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz",
+                    "integrity": "sha512-Yej+zOJ1Dm/IMZzzj78OntP/r3zHEaKcyNoU2lAaxPtrseM6rF0xwqoz5Q5ysAiED9hTjI2hgtvLXitlCN1/Ug==",
+                    "dev": true
+                }
+            }
+        },
         "@gulp-sourcemaps/identity-map": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.1.tgz",
             "integrity": "sha1-z6I7xYQPkQTOMqZedNt+epdLvuE=",
             "dev": true,
             "requires": {
-                "acorn": "5.2.1",
+                "acorn": "5.3.0",
                 "css": "2.2.1",
                 "normalize-path": "2.1.1",
                 "source-map": "0.5.7",
@@ -18,9 +35,9 @@
             },
             "dependencies": {
                 "acorn": {
-                    "version": "5.2.1",
-                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz",
-                    "integrity": "sha512-jG0u7c4Ly+3QkkW18V+NRDN+4bWHdln30NL1ZL2AvFZZmQe/BfopYCtghCKKVBUSetZ4QKcyA0pY6/4Gw8Pv8w==",
+                    "version": "5.3.0",
+                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz",
+                    "integrity": "sha512-Yej+zOJ1Dm/IMZzzj78OntP/r3zHEaKcyNoU2lAaxPtrseM6rF0xwqoz5Q5ysAiED9hTjI2hgtvLXitlCN1/Ug==",
                     "dev": true
                 }
             }
@@ -42,13 +59,13 @@
             "dev": true,
             "requires": {
                 "@types/insert-module-globals": "7.0.0",
-                "@types/node": "8.5.2"
+                "@types/node": "8.5.5"
             }
         },
         "@types/chai": {
-            "version": "4.0.10",
-            "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.0.10.tgz",
-            "integrity": "sha512-Ejh1AXTY8lm+x91X/yar3G2z4x9RyKwdTVdyyu7Xj3dNB35fMNCnEWqTO9FgS3zjzlRNqk1MruYhgb8yhRN9rA==",
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.1.0.tgz",
+            "integrity": "sha512-OuYBlXWHYthxIudMXMeQr92f6D97YoT9CUYCRb0BEP4OavC95jNcczjjr4Ob3H5E1IqlWqwj+leUZPSeth27Qw==",
             "dev": true
         },
         "@types/convert-source-map": {
@@ -79,19 +96,19 @@
             "dev": true,
             "requires": {
                 "@types/events": "1.1.0",
-                "@types/minimatch": "3.0.2",
-                "@types/node": "8.5.2"
+                "@types/minimatch": "3.0.3",
+                "@types/node": "8.5.5"
             }
         },
         "@types/gulp": {
-            "version": "3.8.35",
-            "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-3.8.35.tgz",
-            "integrity": "sha512-h9clNJu8X6+zW74ZLa5zhh5HP0LxnvlelVXdXby6pM/DDEj/gKqmmFXKwjzvupZKlMpof02jr6c3JokPbHXQgg==",
+            "version": "3.8.36",
+            "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-3.8.36.tgz",
+            "integrity": "sha512-u6/zWPzYRNPAtvyFJ3/RSXjmBaBM1dVs5kW22/jU6J786ZGLfSndhLoNOpFI6FGQvqTA+QzFHjSMhpkAN+wxcQ==",
             "dev": true,
             "requires": {
-                "@types/node": "8.5.2",
+                "@types/node": "8.5.5",
                 "@types/orchestrator": "0.3.2",
-                "@types/vinyl": "2.0.1"
+                "@types/vinyl": "2.0.2"
             }
         },
         "@types/gulp-concat": {
@@ -100,7 +117,7 @@
             "integrity": "sha512-CUCFADlITzzBfBa2bdGzhKtvBr4eFh+evb+4igVbvPoO5RyPfHifmyQlZl6lM7q19+OKncRlFXDU7B4X9Ayo2g==",
             "dev": true,
             "requires": {
-                "@types/node": "8.5.2"
+                "@types/node": "8.5.5"
             }
         },
         "@types/gulp-help": {
@@ -109,8 +126,8 @@
             "integrity": "sha512-MkW7psZznxxJg2MBk2P2qHE+T8jEZVFz3FG/qGjUYazkyJt7hBJWx5Nuewmay5RVNtUvSWPrdZLr/WTXY3T/6A==",
             "dev": true,
             "requires": {
-                "@types/gulp": "3.8.35",
-                "@types/node": "8.5.2",
+                "@types/gulp": "3.8.36",
+                "@types/node": "8.5.5",
                 "@types/orchestrator": "0.3.2"
             }
         },
@@ -120,7 +137,7 @@
             "integrity": "sha512-e7J/Zv5Wd7CC0WpuA2syWVitgwrkG0u221e41w7r07XUR6hMH6kHPkq9tUrusHkbeW8QbuLbis5fODOwQCyggQ==",
             "dev": true,
             "requires": {
-                "@types/node": "8.5.2"
+                "@types/node": "8.5.5"
             }
         },
         "@types/gulp-sourcemaps": {
@@ -129,7 +146,7 @@
             "integrity": "sha512-+7BAmptW2bxyJnJcCEuie7vLoop3FwWgCdBMzyv7MYXED/HeNMeQuX7uPCkp4vfU1TTu4CYFH0IckNPvo0VePA==",
             "dev": true,
             "requires": {
-                "@types/node": "8.5.2"
+                "@types/node": "8.5.5"
             }
         },
         "@types/insert-module-globals": {
@@ -138,7 +155,7 @@
             "integrity": "sha512-zudCJPwluh1VUDB6Gl/OQdRp+fYy3+47huJB/JMQubMS2p+sH18MCVK4WUz3FqaWLB12yh5ELxVR/+tqwlm/qA==",
             "dev": true,
             "requires": {
-                "@types/node": "8.5.2"
+                "@types/node": "8.5.5"
             }
         },
         "@types/merge2": {
@@ -147,13 +164,13 @@
             "integrity": "sha512-GjaXY4OultxbaOOk7lCLO7xvEcFpdjExC605YmfI6X29vhHKpJfMWKCDZd3x+BITrZaXKg97DgV/SdGVSwdzxA==",
             "dev": true,
             "requires": {
-                "@types/node": "8.5.2"
+                "@types/node": "8.5.5"
             }
         },
         "@types/minimatch": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.2.tgz",
-            "integrity": "sha512-tctoxbfuMCxeI2CAsnwoZQfaBA+T7gPzDzDuiiFnyCSSyGYEB92cmRTh6E3tdR1hWsprbJ9IdbvX3PzLmJU/GA==",
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+            "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
             "dev": true
         },
         "@types/minimist": {
@@ -168,19 +185,19 @@
             "integrity": "sha512-U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg==",
             "dev": true,
             "requires": {
-                "@types/node": "8.5.2"
+                "@types/node": "8.5.5"
             }
         },
         "@types/mocha": {
-            "version": "2.2.44",
-            "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.44.tgz",
-            "integrity": "sha512-k2tWTQU8G4+iSMvqKi0Q9IIsWAp/n8xzdZS4Q4YVIltApoMA00wFBFdlJnmoaK1/z7B0Cy0yPe6GgXteSmdUNw==",
+            "version": "2.2.46",
+            "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.46.tgz",
+            "integrity": "sha512-fwTTP5QLf4xHMkv7ovcKvmlLWX3GrxCa5DRQDOilVyYGCp+arZTAQJCy7/4GKezzYJjfWMpB/Cy4e8nrc9XioA==",
             "dev": true
         },
         "@types/node": {
-            "version": "8.5.2",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-8.5.2.tgz",
-            "integrity": "sha512-KA4GKOpgXnrqEH2eCVhiv2CsxgXGQJgV1X0vsGlh+WCnxbeAE1GT44ZsTU1IN5dEeV/gDupKa7gWo08V5IxWVQ==",
+            "version": "8.5.5",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-8.5.5.tgz",
+            "integrity": "sha512-JRnfoh0Ll4ElmIXKxbUfcOodkGvcNHljct6mO1X9hE/mlrMzAx0hYCLAD7sgT53YAY1HdlpzUcV0CkmDqUqTuA==",
             "dev": true
         },
         "@types/orchestrator": {
@@ -189,7 +206,7 @@
             "integrity": "sha512-cKB4yTX0wGaRCSkdHDX2fkGQbMAA8UOshC2U7DQky1CE5o+5q2iQQ8VkbPbE/88uaTtsusvBPMcCX7dgmjxBhQ==",
             "dev": true,
             "requires": {
-                "@types/node": "8.5.2",
+                "@types/node": "8.5.5",
                 "@types/q": "1.0.6"
             }
         },
@@ -205,8 +222,8 @@
             "integrity": "sha512-XwGr1b4yCGUILKeBkzmeWcxmGHQ0vFFFpA6D6y1yLO6gKmYorF+PHqdU5KG+nWt38OvtrkDptmrSmlHX/XtpLw==",
             "dev": true,
             "requires": {
-                "@types/gulp": "3.8.35",
-                "@types/node": "8.5.2"
+                "@types/gulp": "3.8.36",
+                "@types/node": "8.5.5"
             }
         },
         "@types/strip-bom": {
@@ -227,16 +244,16 @@
             "integrity": "sha1-H/LoihAN+1sUDnu5h5HxGUQA0TE=",
             "dev": true,
             "requires": {
-                "@types/node": "8.5.2"
+                "@types/node": "8.5.5"
             }
         },
         "@types/vinyl": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.1.tgz",
-            "integrity": "sha512-Joudabfn2ZofU2usW04y8OLmN75u7ZQkW0MCT3AnoBf5oUBp5iQ3Pgfz9+y1RdWkzhCPZo9/wBJ7FMWW2JrY0g==",
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.2.tgz",
+            "integrity": "sha512-2iYpNuOl98SrLPBZfEN9Mh2JCJ2EI9HU35SfgBEb51DcmaHkhp8cKMblYeBqMQiwXMgAD3W60DbQ4i/UdLiXhw==",
             "dev": true,
             "requires": {
-                "@types/node": "8.5.2"
+                "@types/node": "8.5.5"
             }
         },
         "@types/xml2js": {
@@ -245,7 +262,7 @@
             "integrity": "sha512-8aKUBSj3oGcnuiBmDLm3BIk09RYg01mz9HlQ2u4aS17oJ25DxjQrEUVGFSBVNOfM45pQW4OjcBPplq6r/exJdA==",
             "dev": true,
             "requires": {
-                "@types/node": "8.5.2"
+                "@types/node": "8.5.5"
             }
         },
         "JSONStream": {
@@ -298,6 +315,15 @@
             "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
             "dev": true
         },
+        "ansi-cyan": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
+            "integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=",
+            "dev": true,
+            "requires": {
+                "ansi-wrap": "0.1.0"
+            }
+        },
         "ansi-gray": {
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
@@ -307,6 +333,15 @@
                 "ansi-wrap": "0.1.0"
             }
         },
+        "ansi-red": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
+            "integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=",
+            "dev": true,
+            "requires": {
+                "ansi-wrap": "0.1.0"
+            }
+        },
         "ansi-regex": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
@@ -379,12 +414,6 @@
             "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw=",
             "dev": true
         },
-        "array-find-index": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-            "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-            "dev": true
-        },
         "array-map": {
             "version": "0.0.0",
             "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
@@ -451,9 +480,9 @@
             }
         },
         "assertion-error": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.2.tgz",
-            "integrity": "sha1-E8pRXYYgbaC6xm6DTdOX2HWBCUw=",
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+            "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
             "dev": true
         },
         "assign-symbols": {
@@ -624,9 +653,9 @@
             "dev": true
         },
         "browserify": {
-            "version": "14.5.0",
-            "resolved": "https://registry.npmjs.org/browserify/-/browserify-14.5.0.tgz",
-            "integrity": "sha512-gKfOsNQv/toWz+60nSPfYzuwSEdzvV2WdxrVPUbPD/qui44rAkB3t3muNtmmGYHqrG56FGwX9SUEQmzNLAeS7g==",
+            "version": "15.0.0",
+            "resolved": "https://registry.npmjs.org/browserify/-/browserify-15.0.0.tgz",
+            "integrity": "sha512-dERxjzl4yacUzaB4XVVXDFFHARzDr6tLRhjqpE/NJUv0SkS3QVmZKiYTiKEQZhQ2HygCL02FUzSS5r3sY/SlTg==",
             "dev": true,
             "requires": {
                 "JSONStream": "1.3.2",
@@ -652,7 +681,7 @@
                 "inherits": "2.0.3",
                 "insert-module-globals": "7.0.1",
                 "labeled-stream-splicer": "2.0.0",
-                "module-deps": "4.1.1",
+                "module-deps": "5.0.1",
                 "os-browserify": "0.3.0",
                 "parents": "1.0.1",
                 "path-browserify": "0.0.0",
@@ -806,20 +835,11 @@
             "dev": true
         },
         "camelcase": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-            "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-            "dev": true
-        },
-        "camelcase-keys": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-            "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+            "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
             "dev": true,
-            "requires": {
-                "camelcase": "2.1.1",
-                "map-obj": "1.0.1"
-            }
+            "optional": true
         },
         "center-align": {
             "version": "0.1.3",
@@ -847,7 +867,7 @@
             "integrity": "sha1-D2RYS6ZC8PKs4oBiefTwbKI61zw=",
             "dev": true,
             "requires": {
-                "assertion-error": "1.0.2",
+                "assertion-error": "1.1.0",
                 "check-error": "1.0.2",
                 "deep-eql": "3.0.1",
                 "get-func-name": "2.0.0",
@@ -904,6 +924,46 @@
                         "is-descriptor": "0.1.6"
                     }
                 },
+                "is-accessor-descriptor": {
+                    "version": "0.1.6",
+                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+                    "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "3.2.2"
+                    },
+                    "dependencies": {
+                        "kind-of": {
+                            "version": "3.2.2",
+                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                            "dev": true,
+                            "requires": {
+                                "is-buffer": "1.1.6"
+                            }
+                        }
+                    }
+                },
+                "is-data-descriptor": {
+                    "version": "0.1.4",
+                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+                    "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "3.2.2"
+                    },
+                    "dependencies": {
+                        "kind-of": {
+                            "version": "3.2.2",
+                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                            "dev": true,
+                            "requires": {
+                                "is-buffer": "1.1.6"
+                            }
+                        }
+                    }
+                },
                 "is-descriptor": {
                     "version": "0.1.6",
                     "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -1219,15 +1279,6 @@
                 }
             }
         },
-        "currently-unhandled": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-            "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-            "dev": true,
-            "requires": {
-                "array-find-index": "1.0.2"
-            }
-        },
         "d": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
@@ -1284,7 +1335,8 @@
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
             "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-            "dev": true
+            "dev": true,
+            "optional": true
         },
         "decode-uri-component": {
             "version": "0.2.0",
@@ -1322,7 +1374,7 @@
             "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
             "dev": true,
             "requires": {
-                "is-descriptor": "1.0.1"
+                "is-descriptor": "1.0.2"
             }
         },
         "defined": {
@@ -1386,19 +1438,20 @@
             "dev": true
         },
         "detective": {
-            "version": "4.7.1",
-            "resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz",
-            "integrity": "sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==",
+            "version": "5.0.2",
+            "resolved": "https://registry.npmjs.org/detective/-/detective-5.0.2.tgz",
+            "integrity": "sha512-NUsLoezj4wb9o7vpxS9F3L5vcO87ceyRBcl48op06YFNwkyIEY997JpSCA5lDlDuDc6JxOtaL5qfK3muoWxpMA==",
             "dev": true,
             "requires": {
-                "acorn": "5.2.1",
+                "@browserify/acorn5-object-spread": "5.0.1",
+                "acorn": "5.3.0",
                 "defined": "1.0.0"
             },
             "dependencies": {
                 "acorn": {
-                    "version": "5.2.1",
-                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz",
-                    "integrity": "sha512-jG0u7c4Ly+3QkkW18V+NRDN+4bWHdln30NL1ZL2AvFZZmQe/BfopYCtghCKKVBUSetZ4QKcyA0pY6/4Gw8Pv8w==",
+                    "version": "5.3.0",
+                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz",
+                    "integrity": "sha512-Yej+zOJ1Dm/IMZzzj78OntP/r3zHEaKcyNoU2lAaxPtrseM6rF0xwqoz5Q5ysAiED9hTjI2hgtvLXitlCN1/Ug==",
                     "dev": true
                 }
             }
@@ -1493,15 +1546,6 @@
                 }
             }
         },
-        "error-ex": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
-            "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
-            "dev": true,
-            "requires": {
-                "is-arrayish": "0.2.1"
-            }
-        },
         "es5-ext": {
             "version": "0.10.37",
             "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.37.tgz",
@@ -1650,6 +1694,46 @@
                         "is-descriptor": "0.1.6"
                     }
                 },
+                "is-accessor-descriptor": {
+                    "version": "0.1.6",
+                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+                    "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "3.2.2"
+                    },
+                    "dependencies": {
+                        "kind-of": {
+                            "version": "3.2.2",
+                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                            "dev": true,
+                            "requires": {
+                                "is-buffer": "1.1.6"
+                            }
+                        }
+                    }
+                },
+                "is-data-descriptor": {
+                    "version": "0.1.4",
+                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+                    "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "3.2.2"
+                    },
+                    "dependencies": {
+                        "kind-of": {
+                            "version": "3.2.2",
+                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                            "dev": true,
+                            "requires": {
+                                "is-buffer": "1.1.6"
+                            }
+                        }
+                    }
+                },
                 "is-descriptor": {
                     "version": "0.1.6",
                     "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -1745,9 +1829,9 @@
             }
         },
         "extglob": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.2.tgz",
-            "integrity": "sha512-I0+eZBH+jFGL8F5BnIz2ON2nKCjTS3AS3H/5PeSmCp7UVC70Ym8IhdRiQly2juKYQ//f7z1aj1BRpQniFJoU1w==",
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.3.tgz",
+            "integrity": "sha512-AyptZexgu7qppEPq59DtN/XJGZDrLcVxSHai+4hdgMMS9EpF4GBvygcWWApno8lL9qSjVpYt7Raao28qzJX1ww==",
             "dev": true,
             "requires": {
                 "array-unique": "0.3.2",
@@ -1819,16 +1903,6 @@
             "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=",
             "dev": true
         },
-        "find-up": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-            "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-            "dev": true,
-            "requires": {
-                "path-exists": "2.1.0",
-                "pinkie-promise": "2.0.1"
-            }
-        },
         "findup-sync": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
@@ -1837,7 +1911,7 @@
             "requires": {
                 "detect-file": "1.0.0",
                 "is-glob": "3.1.0",
-                "micromatch": "3.1.4",
+                "micromatch": "3.1.5",
                 "resolve-dir": "1.0.1"
             }
         },
@@ -1917,12 +1991,6 @@
             "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
             "dev": true
         },
-        "get-stdin": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-            "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-            "dev": true
-        },
         "get-value": {
             "version": "2.0.6",
             "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
@@ -2242,221 +2310,15 @@
             }
         },
         "gulp-clone": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/gulp-clone/-/gulp-clone-1.0.0.tgz",
-            "integrity": "sha1-mubGVr2cTzae6AXu9WV4a8gQBbA=",
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/gulp-clone/-/gulp-clone-1.1.1.tgz",
+            "integrity": "sha512-+9z6YKyup0pxL1nD9Hw5WjC29d280dsGkegagzt4xKAOvroyzZlA8Bs9MYs2WSSFIDqmcftMUVN/oentgBv69A==",
             "dev": true,
             "requires": {
-                "gulp-util": "2.2.20",
-                "through2": "0.4.2"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "0.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
-                    "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=",
-                    "dev": true
-                },
-                "ansi-styles": {
-                    "version": "1.1.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
-                    "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=",
-                    "dev": true
-                },
-                "chalk": {
-                    "version": "0.5.1",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
-                    "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "1.1.0",
-                        "escape-string-regexp": "1.0.5",
-                        "has-ansi": "0.1.0",
-                        "strip-ansi": "0.3.0",
-                        "supports-color": "0.2.0"
-                    }
-                },
-                "dateformat": {
-                    "version": "1.0.12",
-                    "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-                    "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
-                    "dev": true,
-                    "requires": {
-                        "get-stdin": "4.0.1",
-                        "meow": "3.7.0"
-                    }
-                },
-                "gulp-util": {
-                    "version": "2.2.20",
-                    "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz",
-                    "integrity": "sha1-1xRuVyiRC9jwR6awseVJvCLb1kw=",
-                    "dev": true,
-                    "requires": {
-                        "chalk": "0.5.1",
-                        "dateformat": "1.0.12",
-                        "lodash._reinterpolate": "2.4.1",
-                        "lodash.template": "2.4.1",
-                        "minimist": "0.2.0",
-                        "multipipe": "0.1.2",
-                        "through2": "0.5.1",
-                        "vinyl": "0.2.3"
-                    },
-                    "dependencies": {
-                        "through2": {
-                            "version": "0.5.1",
-                            "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
-                            "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=",
-                            "dev": true,
-                            "requires": {
-                                "readable-stream": "1.0.34",
-                                "xtend": "3.0.0"
-                            }
-                        }
-                    }
-                },
-                "has-ansi": {
-                    "version": "0.1.0",
-                    "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
-                    "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "0.2.1"
-                    }
-                },
-                "isarray": {
-                    "version": "0.0.1",
-                    "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-                    "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-                    "dev": true
-                },
-                "lodash._reinterpolate": {
-                    "version": "2.4.1",
-                    "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz",
-                    "integrity": "sha1-TxInqlqHEfxjL1sHofRgequLMiI=",
-                    "dev": true
-                },
-                "lodash.escape": {
-                    "version": "2.4.1",
-                    "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz",
-                    "integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=",
-                    "dev": true,
-                    "requires": {
-                        "lodash._escapehtmlchar": "2.4.1",
-                        "lodash._reunescapedhtml": "2.4.1",
-                        "lodash.keys": "2.4.1"
-                    }
-                },
-                "lodash.keys": {
-                    "version": "2.4.1",
-                    "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-                    "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-                    "dev": true,
-                    "requires": {
-                        "lodash._isnative": "2.4.1",
-                        "lodash._shimkeys": "2.4.1",
-                        "lodash.isobject": "2.4.1"
-                    }
-                },
-                "lodash.template": {
-                    "version": "2.4.1",
-                    "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz",
-                    "integrity": "sha1-nmEQB+32KRKal0qzxIuBez4c8g0=",
-                    "dev": true,
-                    "requires": {
-                        "lodash._escapestringchar": "2.4.1",
-                        "lodash._reinterpolate": "2.4.1",
-                        "lodash.defaults": "2.4.1",
-                        "lodash.escape": "2.4.1",
-                        "lodash.keys": "2.4.1",
-                        "lodash.templatesettings": "2.4.1",
-                        "lodash.values": "2.4.1"
-                    }
-                },
-                "lodash.templatesettings": {
-                    "version": "2.4.1",
-                    "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz",
-                    "integrity": "sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=",
-                    "dev": true,
-                    "requires": {
-                        "lodash._reinterpolate": "2.4.1",
-                        "lodash.escape": "2.4.1"
-                    }
-                },
-                "minimist": {
-                    "version": "0.2.0",
-                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
-                    "integrity": "sha1-Tf/lJdriuGTGbC4jxicdev3s784=",
-                    "dev": true
-                },
-                "readable-stream": {
-                    "version": "1.0.34",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-                    "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-                    "dev": true,
-                    "requires": {
-                        "core-util-is": "1.0.2",
-                        "inherits": "2.0.3",
-                        "isarray": "0.0.1",
-                        "string_decoder": "0.10.31"
-                    }
-                },
-                "string_decoder": {
-                    "version": "0.10.31",
-                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-                    "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-                    "dev": true
-                },
-                "strip-ansi": {
-                    "version": "0.3.0",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
-                    "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "0.2.1"
-                    }
-                },
-                "supports-color": {
-                    "version": "0.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
-                    "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=",
-                    "dev": true
-                },
-                "through2": {
-                    "version": "0.4.2",
-                    "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
-                    "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=",
-                    "dev": true,
-                    "requires": {
-                        "readable-stream": "1.0.34",
-                        "xtend": "2.1.2"
-                    },
-                    "dependencies": {
-                        "xtend": {
-                            "version": "2.1.2",
-                            "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-                            "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
-                            "dev": true,
-                            "requires": {
-                                "object-keys": "0.4.0"
-                            }
-                        }
-                    }
-                },
-                "vinyl": {
-                    "version": "0.2.3",
-                    "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz",
-                    "integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=",
-                    "dev": true,
-                    "requires": {
-                        "clone-stats": "0.0.1"
-                    }
-                },
-                "xtend": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
-                    "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=",
-                    "dev": true
-                }
+                "chai": "4.1.2",
+                "mocha": "4.1.0",
+                "plugin-error": "0.1.2",
+                "through2": "2.0.3"
             }
         },
         "gulp-concat": {
@@ -2550,25 +2412,25 @@
             }
         },
         "gulp-newer": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/gulp-newer/-/gulp-newer-1.3.0.tgz",
-            "integrity": "sha1-1Q7Ky7gi7aSStXMkpshaB/2aVcE=",
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/gulp-newer/-/gulp-newer-1.4.0.tgz",
+            "integrity": "sha512-h79fGO55S/P9eAADbLAP9aTtVYpLSR1ONj08VPaSdVVNVYhTS8p1CO1TW7kEMu+hC+sytmCqcUr5LesvZEtDoQ==",
             "dev": true,
             "requires": {
                 "glob": "7.1.2",
-                "gulp-util": "3.0.8",
-                "kew": "0.7.0"
+                "kew": "0.7.0",
+                "plugin-error": "0.1.2"
             }
         },
         "gulp-sourcemaps": {
-            "version": "2.6.1",
-            "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.1.tgz",
-            "integrity": "sha512-1qHCI3hdmsMdq/SUotxwUh/L8YzlI6J9zQ5ifNOtx4Y6KV5y5sGuORv1KZzWhuKtz/mXNh5xLESUtwC4EndCjA==",
+            "version": "2.6.3",
+            "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.3.tgz",
+            "integrity": "sha1-EbAz91n5CeCl8Vt730esKcxU76Q=",
             "dev": true,
             "requires": {
                 "@gulp-sourcemaps/identity-map": "1.0.1",
                 "@gulp-sourcemaps/map-sources": "1.0.0",
-                "acorn": "4.0.13",
+                "acorn": "5.3.0",
                 "convert-source-map": "1.5.1",
                 "css": "2.2.1",
                 "debug-fabulous": "1.0.0",
@@ -2576,26 +2438,20 @@
                 "graceful-fs": "4.1.11",
                 "source-map": "0.5.7",
                 "strip-bom-string": "1.0.0",
-                "through2": "2.0.3",
-                "vinyl": "1.2.0"
+                "through2": "2.0.3"
             },
             "dependencies": {
+                "acorn": {
+                    "version": "5.3.0",
+                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz",
+                    "integrity": "sha512-Yej+zOJ1Dm/IMZzzj78OntP/r3zHEaKcyNoU2lAaxPtrseM6rF0xwqoz5Q5ysAiED9hTjI2hgtvLXitlCN1/Ug==",
+                    "dev": true
+                },
                 "graceful-fs": {
                     "version": "4.1.11",
                     "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
                     "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
                     "dev": true
-                },
-                "vinyl": {
-                    "version": "1.2.0",
-                    "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-                    "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-                    "dev": true,
-                    "requires": {
-                        "clone": "1.0.3",
-                        "clone-stats": "0.0.1",
-                        "replace-ext": "0.0.1"
-                    }
                 }
             }
         },
@@ -3078,12 +2934,6 @@
                 "parse-passwd": "1.0.0"
             }
         },
-        "hosted-git-info": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
-            "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==",
-            "dev": true
-        },
         "htmlescape": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz",
@@ -3102,15 +2952,6 @@
             "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
             "dev": true
         },
-        "indent-string": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-            "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-            "dev": true,
-            "requires": {
-                "repeating": "2.0.1"
-            }
-        },
         "indexof": {
             "version": "0.0.1",
             "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
@@ -3181,83 +3022,38 @@
             }
         },
         "is-accessor-descriptor": {
-            "version": "0.1.6",
-            "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-            "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+            "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
             "dev": true,
             "requires": {
-                "kind-of": "3.2.2"
-            },
-            "dependencies": {
-                "kind-of": {
-                    "version": "3.2.2",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                    "dev": true,
-                    "requires": {
-                        "is-buffer": "1.1.6"
-                    }
-                }
+                "kind-of": "6.0.2"
             }
         },
-        "is-arrayish": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-            "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-            "dev": true
-        },
         "is-buffer": {
             "version": "1.1.6",
             "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
             "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
             "dev": true
         },
-        "is-builtin-module": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-            "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-            "dev": true,
-            "requires": {
-                "builtin-modules": "1.1.1"
-            }
-        },
         "is-data-descriptor": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-            "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+            "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
             "dev": true,
             "requires": {
-                "kind-of": "3.2.2"
-            },
-            "dependencies": {
-                "kind-of": {
-                    "version": "3.2.2",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                    "dev": true,
-                    "requires": {
-                        "is-buffer": "1.1.6"
-                    }
-                }
+                "kind-of": "6.0.2"
             }
         },
         "is-descriptor": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.1.tgz",
-            "integrity": "sha512-G3fFVFTqfaqu7r4YuSBHKBAuOaLz8Sy7ekklUpFEliaLMP1Y2ZjoN9jS62YWCAPQrQpMUQSitRlrzibbuCZjdA==",
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+            "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
             "dev": true,
             "requires": {
-                "is-accessor-descriptor": "0.1.6",
-                "is-data-descriptor": "0.1.4",
-                "kind-of": "5.1.0"
-            },
-            "dependencies": {
-                "kind-of": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-                    "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-                    "dev": true
-                }
+                "is-accessor-descriptor": "1.0.0",
+                "is-data-descriptor": "1.0.0",
+                "kind-of": "6.0.2"
             }
         },
         "is-dotfile": {
@@ -3287,15 +3083,6 @@
             "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
             "dev": true
         },
-        "is-finite": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-            "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-            "dev": true,
-            "requires": {
-                "number-is-nan": "1.0.1"
-            }
-        },
         "is-glob": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
@@ -3670,42 +3457,6 @@
                 "resolve": "1.1.7"
             }
         },
-        "load-json-file": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-            "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-            "dev": true,
-            "requires": {
-                "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": {
-                "graceful-fs": {
-                    "version": "4.1.11",
-                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-                    "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-                    "dev": true
-                },
-                "pify": {
-                    "version": "2.3.0",
-                    "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-                    "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-                    "dev": true
-                },
-                "strip-bom": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-                    "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-                    "dev": true,
-                    "requires": {
-                        "is-utf8": "0.2.1"
-                    }
-                }
-            }
-        },
         "lodash": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz",
@@ -3730,51 +3481,18 @@
             "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
             "dev": true
         },
-        "lodash._escapehtmlchar": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz",
-            "integrity": "sha1-32fDu2t+jh6DGrSL+geVuSr+iZ0=",
-            "dev": true,
-            "requires": {
-                "lodash._htmlescapes": "2.4.1"
-            }
-        },
-        "lodash._escapestringchar": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz",
-            "integrity": "sha1-7P4iYYoq3lC/7qQ5N+Ud9m8O23I=",
-            "dev": true
-        },
         "lodash._getnative": {
             "version": "3.9.1",
             "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
             "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
             "dev": true
         },
-        "lodash._htmlescapes": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz",
-            "integrity": "sha1-MtFL8IRLbeb4tioFG09nwii2JMs=",
-            "dev": true
-        },
         "lodash._isiterateecall": {
             "version": "3.0.9",
             "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
             "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
             "dev": true
         },
-        "lodash._isnative": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
-            "integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw=",
-            "dev": true
-        },
-        "lodash._objecttypes": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
-            "integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE=",
-            "dev": true
-        },
         "lodash._reescape": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
@@ -3793,67 +3511,12 @@
             "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
             "dev": true
         },
-        "lodash._reunescapedhtml": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz",
-            "integrity": "sha1-dHxPxAED6zu4oJduVx96JlnpO6c=",
-            "dev": true,
-            "requires": {
-                "lodash._htmlescapes": "2.4.1",
-                "lodash.keys": "2.4.1"
-            },
-            "dependencies": {
-                "lodash.keys": {
-                    "version": "2.4.1",
-                    "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-                    "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-                    "dev": true,
-                    "requires": {
-                        "lodash._isnative": "2.4.1",
-                        "lodash._shimkeys": "2.4.1",
-                        "lodash.isobject": "2.4.1"
-                    }
-                }
-            }
-        },
         "lodash._root": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
             "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
             "dev": true
         },
-        "lodash._shimkeys": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
-            "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=",
-            "dev": true,
-            "requires": {
-                "lodash._objecttypes": "2.4.1"
-            }
-        },
-        "lodash.defaults": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
-            "integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=",
-            "dev": true,
-            "requires": {
-                "lodash._objecttypes": "2.4.1",
-                "lodash.keys": "2.4.1"
-            },
-            "dependencies": {
-                "lodash.keys": {
-                    "version": "2.4.1",
-                    "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-                    "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-                    "dev": true,
-                    "requires": {
-                        "lodash._isnative": "2.4.1",
-                        "lodash._shimkeys": "2.4.1",
-                        "lodash.isobject": "2.4.1"
-                    }
-                }
-            }
-        },
         "lodash.escape": {
             "version": "3.2.0",
             "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
@@ -3881,15 +3544,6 @@
             "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
             "dev": true
         },
-        "lodash.isobject": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
-            "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=",
-            "dev": true,
-            "requires": {
-                "lodash._objecttypes": "2.4.1"
-            }
-        },
         "lodash.keys": {
             "version": "3.1.2",
             "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
@@ -3940,44 +3594,12 @@
                 "lodash.escape": "3.2.0"
             }
         },
-        "lodash.values": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz",
-            "integrity": "sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ=",
-            "dev": true,
-            "requires": {
-                "lodash.keys": "2.4.1"
-            },
-            "dependencies": {
-                "lodash.keys": {
-                    "version": "2.4.1",
-                    "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-                    "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-                    "dev": true,
-                    "requires": {
-                        "lodash._isnative": "2.4.1",
-                        "lodash._shimkeys": "2.4.1",
-                        "lodash.isobject": "2.4.1"
-                    }
-                }
-            }
-        },
         "longest": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
             "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
             "dev": true
         },
-        "loud-rejection": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-            "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-            "dev": true,
-            "requires": {
-                "currently-unhandled": "0.4.1",
-                "signal-exit": "3.0.2"
-            }
-        },
         "lru-cache": {
             "version": "2.7.3",
             "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
@@ -3994,9 +3616,9 @@
             }
         },
         "make-error": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.0.tgz",
-            "integrity": "sha1-Uq06M5zPEM5itAQLcI/nByRLi5Y=",
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.2.tgz",
+            "integrity": "sha512-l9ra35l5VWLF24y75Tg8XgfGLX0ueRhph118WKM6H5denx4bB5QF59+4UAm9oJ2qsPQZas/CQUDdtDdfvYHBdQ==",
             "dev": true
         },
         "make-iterator": {
@@ -4025,12 +3647,6 @@
             "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
             "dev": true
         },
-        "map-obj": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-            "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-            "dev": true
-        },
         "map-visit": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
@@ -4078,24 +3694,6 @@
                 "timers-ext": "0.1.2"
             }
         },
-        "meow": {
-            "version": "3.7.0",
-            "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-            "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-            "dev": true,
-            "requires": {
-                "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"
-            }
-        },
         "merge-stream": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
@@ -4112,9 +3710,9 @@
             "dev": true
         },
         "micromatch": {
-            "version": "3.1.4",
-            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.4.tgz",
-            "integrity": "sha512-kFRtviKYoAJT+t7HggMl0tBFGNAKLw/S7N+CO9qfEQyisob1Oy4pao+geRbkyeEd+V9aOkvZ4mhuyPvI/q9Sfg==",
+            "version": "3.1.5",
+            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.5.tgz",
+            "integrity": "sha512-ykttrLPQrz1PUJcXjwsTUjGoPJ64StIGNE2lGVD1c9CuguJ+L7/navsE8IcDNndOoCMvYV0qc/exfVbMHkUhvA==",
             "dev": true,
             "requires": {
                 "arr-diff": "4.0.0",
@@ -4122,10 +3720,10 @@
                 "braces": "2.3.0",
                 "define-property": "1.0.0",
                 "extend-shallow": "2.0.1",
-                "extglob": "2.0.2",
+                "extglob": "2.0.3",
                 "fragment-cache": "0.2.1",
                 "kind-of": "6.0.2",
-                "nanomatch": "1.2.6",
+                "nanomatch": "1.2.7",
                 "object.pick": "1.3.0",
                 "regex-not": "1.0.0",
                 "snapdragon": "0.8.1",
@@ -4208,9 +3806,9 @@
             }
         },
         "mocha": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/mocha/-/mocha-4.0.1.tgz",
-            "integrity": "sha512-evDmhkoA+cBNiQQQdSKZa2b9+W2mpLoj50367lhy+Klnx9OV8XlCIhigUnn1gaTFLQCa0kdNhEGDr0hCXOQFDw==",
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/mocha/-/mocha-4.1.0.tgz",
+            "integrity": "sha512-0RVnjg1HJsXY2YFDoTNzcc1NKhYuXKRrBAG2gDygmJJA136Cs2QlRliZG1mA0ap7cuaT30mw16luAeln+4RiNA==",
             "dev": true,
             "requires": {
                 "browser-stdout": "1.3.0",
@@ -4252,17 +3850,17 @@
             "dev": true
         },
         "module-deps": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz",
-            "integrity": "sha1-IyFYM/HaE/1gbMuAh7RIUty4If0=",
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-5.0.1.tgz",
+            "integrity": "sha512-sigq/hm/L+Z5IGi1DDl0x2ptkw7S86aFh213QhPLD8v9Opv90IHzKIuWJrRa5bJ77DVKHco2CfIEuThcT/vDJA==",
             "dev": true,
             "requires": {
                 "JSONStream": "1.3.2",
                 "browser-resolve": "1.11.2",
                 "cached-path-relative": "1.0.1",
-                "concat-stream": "1.5.2",
+                "concat-stream": "1.6.0",
                 "defined": "1.0.0",
-                "detective": "4.7.1",
+                "detective": "5.0.2",
                 "duplexer2": "0.1.4",
                 "inherits": "2.0.3",
                 "parents": "1.0.1",
@@ -4272,6 +3870,19 @@
                 "subarg": "1.0.0",
                 "through2": "2.0.3",
                 "xtend": "4.0.1"
+            },
+            "dependencies": {
+                "concat-stream": {
+                    "version": "1.6.0",
+                    "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
+                    "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
+                    "dev": true,
+                    "requires": {
+                        "inherits": "2.0.3",
+                        "readable-stream": "2.3.3",
+                        "typedarray": "0.0.6"
+                    }
+                }
             }
         },
         "ms": {
@@ -4325,9 +3936,9 @@
             }
         },
         "nanomatch": {
-            "version": "1.2.6",
-            "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.6.tgz",
-            "integrity": "sha512-WJ6XTCbvWXUFPbi/bDwKcYkCeOGUHzaJj72KbuPqGn78Ba/F5Vu26Zlo6SuMQbCIst1RGKL1zfWBCOGAlbRLAg==",
+            "version": "1.2.7",
+            "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.7.tgz",
+            "integrity": "sha512-/5ldsnyurvEw7wNpxLFgjVvBLMta43niEYOy0CJ4ntcYSbx6bugRUTQeFb4BR/WanEL1o3aQgHuVLHQaB6tOqg==",
             "dev": true,
             "requires": {
                 "arr-diff": "4.0.0",
@@ -4372,18 +3983,6 @@
                 "abbrev": "1.0.9"
             }
         },
-        "normalize-package-data": {
-            "version": "2.4.0",
-            "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-            "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
-            "dev": true,
-            "requires": {
-                "hosted-git-info": "2.5.0",
-                "is-builtin-module": "1.0.0",
-                "semver": "4.3.6",
-                "validate-npm-package-license": "3.0.1"
-            }
-        },
         "normalize-path": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
@@ -4393,12 +3992,6 @@
                 "remove-trailing-separator": "1.1.0"
             }
         },
-        "number-is-nan": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-            "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-            "dev": true
-        },
         "object-assign": {
             "version": "4.1.1",
             "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -4425,6 +4018,24 @@
                         "is-descriptor": "0.1.6"
                     }
                 },
+                "is-accessor-descriptor": {
+                    "version": "0.1.6",
+                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+                    "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "3.2.2"
+                    }
+                },
+                "is-data-descriptor": {
+                    "version": "0.1.4",
+                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+                    "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "3.2.2"
+                    }
+                },
                 "is-descriptor": {
                     "version": "0.1.6",
                     "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -4455,12 +4066,6 @@
                 }
             }
         },
-        "object-keys": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
-            "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
-            "dev": true
-        },
         "object-visit": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
@@ -4672,15 +4277,6 @@
                 }
             }
         },
-        "parse-json": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-            "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-            "dev": true,
-            "requires": {
-                "error-ex": "1.3.1"
-            }
-        },
         "parse-passwd": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
@@ -4705,15 +4301,6 @@
             "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
             "dev": true
         },
-        "path-exists": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-            "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-            "dev": true,
-            "requires": {
-                "pinkie-promise": "2.0.1"
-            }
-        },
         "path-is-absolute": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -4753,31 +4340,6 @@
             "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
             "dev": true
         },
-        "path-type": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-            "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-            "dev": true,
-            "requires": {
-                "graceful-fs": "4.1.11",
-                "pify": "2.3.0",
-                "pinkie-promise": "2.0.1"
-            },
-            "dependencies": {
-                "graceful-fs": {
-                    "version": "4.1.11",
-                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-                    "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-                    "dev": true
-                },
-                "pify": {
-                    "version": "2.3.0",
-                    "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-                    "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-                    "dev": true
-                }
-            }
-        },
         "pathval": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz",
@@ -4818,6 +4380,58 @@
                 "pinkie": "2.0.4"
             }
         },
+        "plugin-error": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
+            "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
+            "dev": true,
+            "requires": {
+                "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": {
+                    "version": "1.1.0",
+                    "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+                    "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
+                    "dev": true,
+                    "requires": {
+                        "arr-flatten": "1.1.0",
+                        "array-slice": "0.2.3"
+                    }
+                },
+                "arr-union": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
+                    "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
+                    "dev": true
+                },
+                "array-slice": {
+                    "version": "0.2.3",
+                    "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+                    "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
+                    "dev": true
+                },
+                "extend-shallow": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
+                    "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "1.1.0"
+                    }
+                },
+                "kind-of": {
+                    "version": "1.1.0",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+                    "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
+                    "dev": true
+                }
+            }
+        },
         "posix-character-classes": {
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
@@ -4940,27 +4554,6 @@
                 "readable-stream": "2.3.3"
             }
         },
-        "read-pkg": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-            "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-            "dev": true,
-            "requires": {
-                "load-json-file": "1.1.0",
-                "normalize-package-data": "2.4.0",
-                "path-type": "1.1.0"
-            }
-        },
-        "read-pkg-up": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-            "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-            "dev": true,
-            "requires": {
-                "find-up": "1.1.2",
-                "read-pkg": "1.1.0"
-            }
-        },
         "readable-stream": {
             "version": "2.3.3",
             "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
@@ -4985,16 +4578,6 @@
                 "resolve": "1.1.7"
             }
         },
-        "redent": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-            "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-            "dev": true,
-            "requires": {
-                "indent-string": "2.1.0",
-                "strip-indent": "1.0.1"
-            }
-        },
         "regex-cache": {
             "version": "0.4.4",
             "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
@@ -5031,15 +4614,6 @@
             "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
             "dev": true
         },
-        "repeating": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-            "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-            "dev": true,
-            "requires": {
-                "is-finite": "1.0.2"
-            }
-        },
         "replace-ext": {
             "version": "0.0.1",
             "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
@@ -5098,13 +4672,14 @@
             }
         },
         "run-sequence": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/run-sequence/-/run-sequence-2.2.0.tgz",
-            "integrity": "sha512-xW5DmUwdvoyYQUMPKN8UW7TZSFs7AxtT59xo1m5y91jHbvwGlGgOmdV1Yw5P68fkjf3aHUZ4G1o1mZCtNe0qtw==",
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/run-sequence/-/run-sequence-2.2.1.tgz",
+            "integrity": "sha512-qkzZnQWMZjcKbh3CNly2srtrkaO/2H/SI5f2eliMCapdRD3UhMrwjfOAZJAnZ2H8Ju4aBzFZkBGXUqFs9V0yxw==",
             "dev": true,
             "requires": {
                 "chalk": "1.1.3",
-                "gulp-util": "3.0.8"
+                "fancy-log": "1.3.2",
+                "plugin-error": "0.1.2"
             },
             "dependencies": {
                 "ansi-styles": {
@@ -5237,12 +4812,6 @@
             "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
             "dev": true
         },
-        "signal-exit": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-            "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-            "dev": true
-        },
         "snapdragon": {
             "version": "0.8.1",
             "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.1.tgz",
@@ -5268,6 +4837,46 @@
                         "is-descriptor": "0.1.6"
                     }
                 },
+                "is-accessor-descriptor": {
+                    "version": "0.1.6",
+                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+                    "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "3.2.2"
+                    },
+                    "dependencies": {
+                        "kind-of": {
+                            "version": "3.2.2",
+                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                            "dev": true,
+                            "requires": {
+                                "is-buffer": "1.1.6"
+                            }
+                        }
+                    }
+                },
+                "is-data-descriptor": {
+                    "version": "0.1.4",
+                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+                    "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "3.2.2"
+                    },
+                    "dependencies": {
+                        "kind-of": {
+                            "version": "3.2.2",
+                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                            "dev": true,
+                            "requires": {
+                                "is-buffer": "1.1.6"
+                            }
+                        }
+                    }
+                },
                 "is-descriptor": {
                     "version": "0.1.6",
                     "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -5387,27 +4996,6 @@
             "integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=",
             "dev": true
         },
-        "spdx-correct": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
-            "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
-            "dev": true,
-            "requires": {
-                "spdx-license-ids": "1.2.2"
-            }
-        },
-        "spdx-expression-parse": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
-            "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=",
-            "dev": true
-        },
-        "spdx-license-ids": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
-            "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=",
-            "dev": true
-        },
         "split-string": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -5463,6 +5051,46 @@
                         "is-descriptor": "0.1.6"
                     }
                 },
+                "is-accessor-descriptor": {
+                    "version": "0.1.6",
+                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+                    "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "3.2.2"
+                    },
+                    "dependencies": {
+                        "kind-of": {
+                            "version": "3.2.2",
+                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                            "dev": true,
+                            "requires": {
+                                "is-buffer": "1.1.6"
+                            }
+                        }
+                    }
+                },
+                "is-data-descriptor": {
+                    "version": "0.1.4",
+                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+                    "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "3.2.2"
+                    },
+                    "dependencies": {
+                        "kind-of": {
+                            "version": "3.2.2",
+                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                            "dev": true,
+                            "requires": {
+                                "is-buffer": "1.1.6"
+                            }
+                        }
+                    }
+                },
                 "is-descriptor": {
                     "version": "0.1.6",
                     "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -5627,15 +5255,6 @@
             "integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=",
             "dev": true
         },
-        "strip-indent": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-            "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-            "dev": true,
-            "requires": {
-                "get-stdin": "4.0.1"
-            }
-        },
         "strip-json-comments": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
@@ -5784,6 +5403,46 @@
                         "is-descriptor": "0.1.6"
                     }
                 },
+                "is-accessor-descriptor": {
+                    "version": "0.1.6",
+                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+                    "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "3.2.2"
+                    },
+                    "dependencies": {
+                        "kind-of": {
+                            "version": "3.2.2",
+                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                            "dev": true,
+                            "requires": {
+                                "is-buffer": "1.1.6"
+                            }
+                        }
+                    }
+                },
+                "is-data-descriptor": {
+                    "version": "0.1.4",
+                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+                    "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "3.2.2"
+                    },
+                    "dependencies": {
+                        "kind-of": {
+                            "version": "3.2.2",
+                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                            "dev": true,
+                            "requires": {
+                                "is-buffer": "1.1.6"
+                            }
+                        }
+                    }
+                },
                 "is-descriptor": {
                     "version": "0.1.6",
                     "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -5819,22 +5478,16 @@
             "integrity": "sha1-/sAF+dyqJZo/lFnOWmkGq6TFRdo=",
             "dev": true
         },
-        "trim-newlines": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-            "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-            "dev": true
-        },
         "ts-node": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-4.0.2.tgz",
-            "integrity": "sha512-mg7l6ON8asjnfzkTi1LFWKaOGHl5Jf1+5ij0MQ502YfC6+4FBgh/idJgw9aN9kei1Rf4/pmFpNuFE1YbcQdOTA==",
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-4.1.0.tgz",
+            "integrity": "sha512-xcZH12oVg9PShKhy3UHyDmuDLV3y7iKwX25aMVPt1SIXSuAfWkFiGPEkg+th8R4YKW/QCxDoW7lJdb15lx6QWg==",
             "dev": true,
             "requires": {
                 "arrify": "1.0.1",
                 "chalk": "2.3.0",
                 "diff": "3.3.1",
-                "make-error": "1.3.0",
+                "make-error": "1.3.2",
                 "minimist": "1.2.0",
                 "mkdirp": "0.5.1",
                 "source-map-support": "0.5.0",
@@ -5896,7 +5549,7 @@
                 "resolve": "1.5.0",
                 "semver": "5.4.1",
                 "tslib": "1.8.1",
-                "tsutils": "2.13.1"
+                "tsutils": "2.16.0"
             },
             "dependencies": {
                 "resolve": {
@@ -5917,9 +5570,9 @@
             }
         },
         "tsutils": {
-            "version": "2.13.1",
-            "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.13.1.tgz",
-            "integrity": "sha512-XMOEvc2TiYesVSOJMI7OYPnBMSgcvERuGW5Li/J+2A0TuH607BPQnOLQ82oSPZCssB8c9+QGi6qhTBa/f1xQRA==",
+            "version": "2.16.0",
+            "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.16.0.tgz",
+            "integrity": "sha512-9Ier/60O7OZRNPiw+or5QAtAY4kQA+WDiO/r6xOYATEyefH9bdfvTRLCxrYnFhQlZfET2vYXKfpr3Vw2BiArZw==",
             "dev": true,
             "requires": {
                 "tslib": "1.8.1"
@@ -5953,9 +5606,9 @@
             "dev": true
         },
         "typescript": {
-            "version": "2.7.0-dev.20171221",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.0-dev.20171221.tgz",
-            "integrity": "sha512-PM09fTK1T0WSZHNDXqrB/P6lTaQkzAnXlx23Q5J/21oQ8kgU7B7TtUFTX7zzdSZnH78j49aUx5bVuQCRJkBowg==",
+            "version": "2.7.0-dev.20180108",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.0-dev.20180108.tgz",
+            "integrity": "sha512-ZlggGsch8Y2d0LqAlCYGRzm/gdm2bqSpb4rdthY+YvpPsQqFixT0tU8sgjeRibMXW9hbS2Hz6kibS8L2oUKWfQ==",
             "dev": true
         },
         "uglify-js": {
@@ -6105,6 +5758,46 @@
                         "is-descriptor": "0.1.6"
                     }
                 },
+                "is-accessor-descriptor": {
+                    "version": "0.1.6",
+                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+                    "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "3.2.2"
+                    },
+                    "dependencies": {
+                        "kind-of": {
+                            "version": "3.2.2",
+                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                            "dev": true,
+                            "requires": {
+                                "is-buffer": "1.1.6"
+                            }
+                        }
+                    }
+                },
+                "is-data-descriptor": {
+                    "version": "0.1.4",
+                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+                    "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "3.2.2"
+                    },
+                    "dependencies": {
+                        "kind-of": {
+                            "version": "3.2.2",
+                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                            "dev": true,
+                            "requires": {
+                                "is-buffer": "1.1.6"
+                            }
+                        }
+                    }
+                },
                 "is-descriptor": {
                     "version": "0.1.6",
                     "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -6174,16 +5867,6 @@
             "integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=",
             "dev": true
         },
-        "validate-npm-package-license": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-            "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
-            "dev": true,
-            "requires": {
-                "spdx-correct": "1.0.2",
-                "spdx-expression-parse": "1.0.4"
-            }
-        },
         "vinyl": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz",
@@ -6362,15 +6045,6 @@
                 "cliui": "2.1.0",
                 "decamelize": "1.2.0",
                 "window-size": "0.1.0"
-            },
-            "dependencies": {
-                "camelcase": {
-                    "version": "1.2.1",
-                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-                    "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-                    "dev": true,
-                    "optional": true
-                }
             }
         },
         "yn": {
diff --git a/scripts/tslint/rules/typeOperatorSpacingRule.ts b/scripts/tslint/rules/typeOperatorSpacingRule.ts
index d7da2e6b5e8..82dccfe0eac 100644
--- a/scripts/tslint/rules/typeOperatorSpacingRule.ts
+++ b/scripts/tslint/rules/typeOperatorSpacingRule.ts
@@ -2,7 +2,7 @@ import * as Lint from "tslint/lib";
 import * as ts from "typescript";
 
 export class Rule extends Lint.Rules.AbstractRule {
-    public static FAILURE_STRING = "The '|' and '&' operators must be surrounded by single spaces";
+    public static FAILURE_STRING = "The '|' and '&' operators must be surrounded by spaces";
 
     public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
         return this.applyWithFunction(sourceFile, walk);
@@ -11,26 +11,20 @@ export class Rule extends Lint.Rules.AbstractRule {
 
 function walk(ctx: Lint.WalkContext<void>): void {
     const { sourceFile } = ctx;
-    ts.forEachChild(sourceFile, recur);
-    function recur(node: ts.Node): void {
-        if (node.kind === ts.SyntaxKind.UnionType || node.kind === ts.SyntaxKind.IntersectionType) {
-            check((node as ts.UnionOrIntersectionTypeNode).types);
+    sourceFile.forEachChild(function cb(node: ts.Node): void {
+        if (ts.isUnionTypeNode(node) || ts.isIntersectionTypeNode(node)) {
+            check(node);
         }
-        ts.forEachChild(node, recur);
-    }
+        node.forEachChild(cb);
+    });
 
-    function check(types: ReadonlyArray<ts.TypeNode>): void {
-        let expectedStart = types[0].end + 2; // space, | or &
-        for (let i = 1; i < types.length; i++) {
-            const currentType = types[i];
-            if (expectedStart !== currentType.pos || currentType.getLeadingTriviaWidth() !== 1) {
-                const previousTypeEndPos = sourceFile.getLineAndCharacterOfPosition(types[i - 1].end);
-                const currentTypeStartPos = sourceFile.getLineAndCharacterOfPosition(currentType.pos);
-                if (previousTypeEndPos.line === currentTypeStartPos.line) {
-                    ctx.addFailureAtNode(currentType, Rule.FAILURE_STRING);
-                }
+    function check(node: ts.UnionTypeNode | ts.IntersectionTypeNode): void {
+        const list = node.getChildren().find(child => child.kind === ts.SyntaxKind.SyntaxList)!;
+        for (const child of list.getChildren()) {
+            if ((child.kind === ts.SyntaxKind.BarToken || child.kind === ts.SyntaxKind.AmpersandToken)
+                && (/\S/.test(sourceFile.text[child.getStart(sourceFile) - 1]) || /\S/.test(sourceFile.text[child.end]))) {
+                ctx.addFailureAtNode(child, Rule.FAILURE_STRING);
             }
-            expectedStart = currentType.end + 2;
         }
     }
 }
diff --git a/src/services/shims.ts b/src/services/shims.ts
index 34a8bbb10d9..fda698785b3 100644
--- a/src/services/shims.ts
+++ b/src/services/shims.ts
@@ -141,7 +141,6 @@ namespace ts {
         getEncodedSemanticClassifications(fileName: string, start: number, length: number): string;
 
         getCompletionsAtPosition(fileName: string, position: number, options: GetCompletionsAtPositionOptions | undefined): string;
-        // tslint:disable-next-line type-operator-spacing (false positive)
         getCompletionEntryDetails(fileName: string, position: number, entryName: string, options: string/*Services.FormatCodeOptions*/ | undefined, source: string | undefined): string;
 
         getQuickInfoAtPosition(fileName: string, position: number): string;
@@ -907,7 +906,6 @@ namespace ts {
         }
 
         /** Get a string based representation of a completion list entry details */
-        // tslint:disable-next-line type-operator-spacing (false positive)
         public getCompletionEntryDetails(fileName: string, position: number, entryName: string, options: string/*Services.FormatCodeOptions*/ | undefined, source: string | undefined) {
             return this.forwardJSONCall(
                 `getCompletionEntryDetails('${fileName}', ${position}, '${entryName}')`,