diff --git a/package-lock.json b/package-lock.json
index ab76b84901..be7484a6dc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -181,7 +181,7 @@
     "ansi-escapes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz",
-      "integrity": "sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ==",
+      "integrity": "sha1-7D6LTp+AZPwCw6ybZfHCdb2o75I=",
       "dev": true
     },
     "ansi-regex": {
@@ -242,7 +242,7 @@
     "arr-flatten": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=",
       "dev": true
     },
     "array-differ": {
@@ -2147,7 +2147,6 @@
       "requires": {
         "anymatch": "1.3.2",
         "async-each": "1.0.1",
-        "fsevents": "1.1.3",
         "glob-parent": "2.0.0",
         "inherits": "2.0.3",
         "is-binary-path": "1.0.1",
@@ -2182,7 +2181,7 @@
     "circular-json": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
+      "integrity": "sha1-gVyZ6oT2gJUp0vRXkb34JxE1LWY=",
       "dev": true
     },
     "clap": {
@@ -2698,7 +2697,7 @@
     "content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=",
       "dev": true
     },
     "convert-source-map": {
@@ -2734,7 +2733,7 @@
     "cosmiconfig": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
-      "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
+      "integrity": "sha1-YXPOvVb6wELB9DkO33r2wHx8uJI=",
       "dev": true,
       "requires": {
         "is-directory": "0.3.1",
@@ -2823,7 +2822,7 @@
         "lru-cache": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
-          "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
+          "integrity": "sha1-Yi4y6CSItJJ5EUpPns9F581rulU=",
           "dev": true,
           "requires": {
             "pseudomap": "1.0.2",
@@ -3571,7 +3570,7 @@
     "data-uri-to-buffer": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz",
-      "integrity": "sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ==",
+      "integrity": "sha1-dxY+qcINhkG0cH6PGKvfmnjzSDU=",
       "dev": true
     },
     "date-now": {
@@ -4142,7 +4141,7 @@
     "editorconfig": {
       "version": "0.13.3",
       "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz",
-      "integrity": "sha512-WkjsUNVCu+ITKDj73QDvi0trvpdDWdkDyHybDGSXPfekLCqwmpD7CP7iPbvBgosNuLcI96XTDwNa75JyFl7tEQ==",
+      "integrity": "sha1-5SGeWHlR1glY/ZTqmpoAjN7/GzQ=",
       "dev": true,
       "requires": {
         "bluebird": "3.4.6",
@@ -4658,7 +4657,7 @@
     "ev-emitter": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ev-emitter/-/ev-emitter-1.1.1.tgz",
-      "integrity": "sha512-ipiDYhdQSCZ4hSbX4rMW+XzNKMD1prg/sTvoVmSLkuQ1MVlwjJQQA+sW8tMYR3BLUr9KjodFV4pvzunvRhd33Q=="
+      "integrity": "sha1-jxiwzlx2pdGAF/ccCnlcZbkTjyo="
     },
     "event-stream": {
       "version": "3.0.20",
@@ -5158,7 +5157,7 @@
     "file-uri-to-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "integrity": "sha1-VTp7hEb/b2hDWcRF8eN6BdrMM90=",
       "dev": true
     },
     "filename-regex": {
@@ -5397,1031 +5396,6 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
-    "fsevents": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",
-      "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "nan": "2.8.0",
-        "node-pre-gyp": "0.6.39"
-      },
-      "dependencies": {
-        "abbrev": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
-          "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=",
-          "dev": true,
-          "optional": true
-        },
-        "ajv": {
-          "version": "4.11.8",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
-          }
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "aproba": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz",
-          "integrity": "sha1-ldNgDwdxCqDpKYxyatXs8urLq6s=",
-          "dev": true,
-          "optional": true
-        },
-        "are-we-there-yet": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
-          "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "delegates": "1.0.0",
-            "readable-stream": "2.2.9"
-          }
-        },
-        "asn1": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-          "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-          "dev": true,
-          "optional": true
-        },
-        "assert-plus": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-          "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
-          "dev": true,
-          "optional": true
-        },
-        "asynckit": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-          "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-          "dev": true,
-          "optional": true
-        },
-        "aws-sign2": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-          "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
-          "dev": true,
-          "optional": true
-        },
-        "aws4": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-          "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
-          "dev": true,
-          "optional": true
-        },
-        "balanced-match": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-          "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-          "dev": true
-        },
-        "bcrypt-pbkdf": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-          "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "tweetnacl": "0.14.5"
-          }
-        },
-        "block-stream": {
-          "version": "0.0.9",
-          "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-          "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.3"
-          }
-        },
-        "boom": {
-          "version": "2.10.1",
-          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-          "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
-          "dev": true,
-          "requires": {
-            "hoek": "2.16.3"
-          }
-        },
-        "brace-expansion": {
-          "version": "1.1.7",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz",
-          "integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=",
-          "dev": true,
-          "requires": {
-            "balanced-match": "0.4.2",
-            "concat-map": "0.0.1"
-          }
-        },
-        "buffer-shims": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
-          "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=",
-          "dev": true
-        },
-        "caseless": {
-          "version": "0.12.0",
-          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-          "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-          "dev": true,
-          "optional": true
-        },
-        "co": {
-          "version": "4.6.0",
-          "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-          "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-          "dev": true,
-          "optional": true
-        },
-        "code-point-at": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-          "dev": true
-        },
-        "combined-stream": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-          "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-          "dev": true,
-          "requires": {
-            "delayed-stream": "1.0.0"
-          }
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "dev": true
-        },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-          "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-          "dev": true
-        },
-        "cryptiles": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-          "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-          "dev": true,
-          "requires": {
-            "boom": "2.10.1"
-          }
-        },
-        "dashdash": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-          "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "1.0.0"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "debug": {
-          "version": "2.6.8",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "deep-extend": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
-          "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=",
-          "dev": true,
-          "optional": true
-        },
-        "delayed-stream": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-          "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-          "dev": true
-        },
-        "delegates": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-          "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-          "dev": true,
-          "optional": true
-        },
-        "detect-libc": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.2.tgz",
-          "integrity": "sha1-ca1dIEvxempsqPRQxhRUBm70YeE=",
-          "dev": true,
-          "optional": true
-        },
-        "ecc-jsbn": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-          "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsbn": "0.1.1"
-          }
-        },
-        "extend": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-          "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-          "dev": true,
-          "optional": true
-        },
-        "extsprintf": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
-          "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
-          "dev": true
-        },
-        "forever-agent": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-          "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-          "dev": true,
-          "optional": true
-        },
-        "form-data": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-          "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "asynckit": "0.4.0",
-            "combined-stream": "1.0.5",
-            "mime-types": "2.1.15"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-          "dev": true
-        },
-        "fstream": {
-          "version": "1.0.11",
-          "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-          "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "inherits": "2.0.3",
-            "mkdirp": "0.5.1",
-            "rimraf": "2.6.1"
-          }
-        },
-        "fstream-ignore": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
-          "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "fstream": "1.0.11",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4"
-          }
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-          "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "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": {
-          "version": "0.1.7",
-          "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-          "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "1.0.0"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-          "dev": true,
-          "requires": {
-            "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": {
-          "version": "4.1.11",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-          "dev": true
-        },
-        "har-schema": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
-          "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
-          "dev": true,
-          "optional": true
-        },
-        "har-validator": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-          "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ajv": "4.11.8",
-            "har-schema": "1.0.5"
-          }
-        },
-        "has-unicode": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-          "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-          "dev": true,
-          "optional": true
-        },
-        "hawk": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-          "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-          "dev": true,
-          "requires": {
-            "boom": "2.10.1",
-            "cryptiles": "2.0.5",
-            "hoek": "2.16.3",
-            "sntp": "1.0.9"
-          }
-        },
-        "hoek": {
-          "version": "2.16.3",
-          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-          "dev": true
-        },
-        "http-signature": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-          "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "0.2.0",
-            "jsprim": "1.4.0",
-            "sshpk": "1.13.0"
-          }
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-          "dev": true,
-          "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
-        },
-        "ini": {
-          "version": "1.3.4",
-          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
-          "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=",
-          "dev": true,
-          "optional": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "1.0.1"
-          }
-        },
-        "is-typedarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-          "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-          "dev": true,
-          "optional": true
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "isstream": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-          "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-          "dev": true,
-          "optional": true
-        },
-        "jodid25519": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz",
-          "integrity": "sha1-BtSRIlUJNBlHfUJWM2BuDpB4KWc=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsbn": "0.1.1"
-          }
-        },
-        "jsbn": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-          "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-          "dev": true,
-          "optional": true
-        },
-        "json-schema": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-          "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-          "dev": true,
-          "optional": true
-        },
-        "json-stable-stringify": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-          "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsonify": "0.0.0"
-          }
-        },
-        "json-stringify-safe": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-          "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-          "dev": true,
-          "optional": true
-        },
-        "jsonify": {
-          "version": "0.0.0",
-          "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-          "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-          "dev": true,
-          "optional": true
-        },
-        "jsprim": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
-          "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "1.0.0",
-            "extsprintf": "1.0.2",
-            "json-schema": "0.2.3",
-            "verror": "1.3.6"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "mime-db": {
-          "version": "1.27.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
-          "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=",
-          "dev": true
-        },
-        "mime-types": {
-          "version": "2.1.15",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
-          "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=",
-          "dev": true,
-          "requires": {
-            "mime-db": "1.27.0"
-          }
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "1.1.7"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-          "dev": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true,
-          "optional": true
-        },
-        "nan": {
-          "version": "2.8.0",
-          "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",
-          "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=",
-          "dev": true,
-          "optional": true
-        },
-        "node-pre-gyp": {
-          "version": "0.6.39",
-          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz",
-          "integrity": "sha512-OsJV74qxnvz/AMGgcfZoDaeDXKD3oY3QVIbBmwszTFkRisTSXbMQyn4UWzUMOtA5SVhrBZOTp0wcoSBgfMfMmQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "detect-libc": "1.0.2",
-            "hawk": "3.1.3",
-            "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"
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-          "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "abbrev": "1.1.0",
-            "osenv": "0.1.4"
-          }
-        },
-        "npmlog": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz",
-          "integrity": "sha512-ocolIkZYZt8UveuiDS0yAkkIjid1o7lPG8cYm05yNYzBn8ykQtaiPMEGp8fY9tKdDgm8okpdKzkvu1y9hUYugA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "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": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-          "dev": true
-        },
-        "oauth-sign": {
-          "version": "0.8.2",
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-          "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
-          "dev": true,
-          "optional": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
-        },
-        "once": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-          "dev": true,
-          "requires": {
-            "wrappy": "1.0.2"
-          }
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-          "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-          "dev": true,
-          "optional": true
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-          "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-          "dev": true,
-          "optional": true
-        },
-        "osenv": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
-          "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "os-homedir": "1.0.2",
-            "os-tmpdir": "1.0.2"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-          "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-          "dev": true
-        },
-        "performance-now": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-          "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
-          "dev": true,
-          "optional": true
-        },
-        "process-nextick-args": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-          "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-          "dev": true
-        },
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true,
-          "optional": true
-        },
-        "qs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
-          "dev": true,
-          "optional": true
-        },
-        "rc": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
-          "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "deep-extend": "0.4.2",
-            "ini": "1.3.4",
-            "minimist": "1.2.0",
-            "strip-json-comments": "2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-              "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "2.2.9",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
-          "integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=",
-          "dev": true,
-          "requires": {
-            "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": {
-          "version": "2.81.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-          "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "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": {
-          "version": "2.6.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
-          "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
-          "dev": true,
-          "requires": {
-            "glob": "7.1.2"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
-          "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=",
-          "dev": true
-        },
-        "semver": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-          "dev": true,
-          "optional": true
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-          "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-          "dev": true,
-          "optional": 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,
-          "optional": true
-        },
-        "sntp": {
-          "version": "1.0.9",
-          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-          "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-          "dev": true,
-          "requires": {
-            "hoek": "2.16.3"
-          }
-        },
-        "sshpk": {
-          "version": "1.13.0",
-          "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz",
-          "integrity": "sha1-/yo+T9BEl1Vf7Zezmg/YL6+zozw=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "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": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "dev": true,
-          "requires": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
-          "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
-        "stringstream": {
-          "version": "0.0.5",
-          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-          "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
-          "dev": true,
-          "optional": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "2.1.1"
-          }
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-          "dev": true,
-          "optional": true
-        },
-        "tar": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-          "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
-          "dev": true,
-          "requires": {
-            "block-stream": "0.0.9",
-            "fstream": "1.0.11",
-            "inherits": "2.0.3"
-          }
-        },
-        "tar-pack": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
-          "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "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": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-          "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "punycode": "1.4.1"
-          }
-        },
-        "tunnel-agent": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-          "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
-        "tweetnacl": {
-          "version": "0.14.5",
-          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-          "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-          "dev": true,
-          "optional": true
-        },
-        "uid-number": {
-          "version": "0.0.6",
-          "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
-          "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=",
-          "dev": true,
-          "optional": true
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-          "dev": true
-        },
-        "uuid": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
-          "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE=",
-          "dev": true,
-          "optional": true
-        },
-        "verror": {
-          "version": "1.3.6",
-          "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
-          "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "extsprintf": "1.0.2"
-          }
-        },
-        "wide-align": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
-          "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "string-width": "1.0.2"
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-          "dev": true
-        }
-      }
-    },
     "fstream": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
@@ -6555,7 +5529,7 @@
     "get-uri": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-2.0.1.tgz",
-      "integrity": "sha512-7aelVrYqCLuVjq2kEKRTH8fXPTC0xKTkM+G7UlFkEwCXY3sFbSxvY375JoFowOAYbkaU47SrBvOefUlLZZ+6QA==",
+      "integrity": "sha1-29ysrNjGCKODFoaTaBF2l6FjHFk=",
       "dev": true,
       "requires": {
         "data-uri-to-buffer": "1.2.0",
@@ -6594,7 +5568,7 @@
     "glob": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
       "dev": true,
       "requires": {
         "fs.realpath": "1.0.0",
@@ -6649,7 +5623,7 @@
     "globals": {
       "version": "9.18.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+      "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=",
       "dev": true
     },
     "globby": {
@@ -7322,7 +6296,7 @@
     "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==",
+      "integrity": "sha1-bWDjSzq7yDEwYsO3mO+NkBoHrzw=",
       "dev": true
     },
     "html-comment-regex": {
@@ -7519,7 +6493,7 @@
     "inquirer": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
-      "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
+      "integrity": "sha1-ndLyrXZdyrH/BEO0kUQqILoifck=",
       "dev": true,
       "requires": {
         "ansi-escapes": "3.0.0",
@@ -8004,9 +6978,7 @@
       "integrity": "sha1-oJb+X04PKraaBYXPEEVYd/V1Br0="
     },
     "jquery.joyride": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/jquery.joyride/-/jquery.joyride-2.2.0.tgz",
-      "integrity": "sha1-iIM1wbseyLMd6Mz9s5QY+3M5rnI="
+      "version": "git+https://git@github.com/nasa-gibs/joyride.git#a83e1c6f9868d16bc503e5e16b29f2296d3038d1"
     },
     "js-base64": {
       "version": "2.4.0",
@@ -8345,7 +7317,7 @@
     "known-css-properties": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.2.0.tgz",
-      "integrity": "sha512-UTCzU28rRI9wkb8qSGoZa9pgWvxr4LjP2MEhi9XHb/1XMOJy0uTnIxaxzj8My/PORG+kQG6VzAcGvRw66eIOfA==",
+      "integrity": "sha1-iZyUvjaOVbQtfbjVvn1zpKSkFFQ=",
       "dev": true
     },
     "labeled-stream-splicer": {
@@ -9520,7 +8492,7 @@
     "node-fetch": {
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
-      "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
+      "integrity": "sha1-mA9vcthSEaU0fGsrwYxbhMPrR+8=",
       "requires": {
         "encoding": "0.1.12",
         "is-stream": "1.1.0"
@@ -9550,7 +8522,7 @@
     "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==",
+      "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=",
       "dev": true,
       "requires": {
         "hosted-git-info": "2.5.0",
@@ -9973,7 +8945,7 @@
     "pac-proxy-agent": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-1.1.0.tgz",
-      "integrity": "sha512-QBELCWyLYPgE2Gj+4wUEiMscHrQ8nRPBzYItQNOHWavwBt25ohZHQC4qnd5IszdVVrFbLsQ+dPkm6eqdjJAmwQ==",
+      "integrity": "sha1-NKOF399h0vDsrOCIWMdF0+eR/U0=",
       "dev": true,
       "requires": {
         "agent-base": "2.1.1",
@@ -10606,7 +9578,7 @@
     "pluralize": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
+      "integrity": "sha1-KYuJ34uTsCIdv0Ia0rGx6iP8Z3c=",
       "dev": true
     },
     "policyfile": {
@@ -12895,7 +11867,7 @@
     "promise": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
-      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
+      "integrity": "sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078=",
       "requires": {
         "asap": "2.0.6"
       }
@@ -13163,7 +12135,7 @@
     "randomatic": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-      "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
+      "integrity": "sha1-x6vpzIuHwLqodrGf3oP9RkeX44w=",
       "dev": true,
       "requires": {
         "is-number": "3.0.0",
@@ -13539,7 +12511,7 @@
     "regex-cache": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
+      "integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=",
       "dev": true,
       "requires": {
         "is-equal-shallow": "0.1.3"
@@ -13927,7 +12899,7 @@
     "safe-buffer": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+      "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=",
       "dev": true
     },
     "samsam": {
@@ -14237,7 +13209,7 @@
     "socks-proxy-agent": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz",
-      "integrity": "sha512-sFtmYqdUK5dAMh85H0LEVFUCO7OhJJe1/z2x/Z6mxp3s7/QPf1RkZmpZy+BpuU0bEjcV9npqKjq9Y3kwFUjnxw==",
+      "integrity": "sha1-huuwcZMlhjeHDhO3vZnybGY989M=",
       "dev": true,
       "requires": {
         "agent-base": "2.1.1",
@@ -14881,7 +13853,7 @@
             "ansi-styles": {
               "version": "3.2.0",
               "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-              "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+              "integrity": "sha1-wVm41b4PnlpvNG2rlPFs4CIWG4g=",
               "dev": true,
               "requires": {
                 "color-convert": "1.9.1"
@@ -15669,7 +14641,7 @@
             "ansi-styles": {
               "version": "3.2.0",
               "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-              "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+              "integrity": "sha1-wVm41b4PnlpvNG2rlPFs4CIWG4g=",
               "dev": true,
               "requires": {
                 "color-convert": "1.9.1"
@@ -16052,7 +15024,7 @@
     "tiny-emitter": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz",
-      "integrity": "sha512-2NM0auVBGft5tee/OxP4PI3d8WItkDM+fPnaRAVo6xTDI2knbz9eC5ArWGqtGlYqiH3RU5yMpdyTTO7MguC4ow=="
+      "integrity": "sha1-gtJ0aKylrejl/R5tIrV91D69+3w="
     },
     "tinycolor": {
       "version": "0.0.1",
diff --git a/package.json b/package.json
index 9ac0af628c..b58f43d5b4 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "jquery": "^2.1.4",
     "jquery-jcrop": "^0.9.13",
     "jquery-ui": "1.10.4",
-    "jquery.joyride": "^2.2.0",
+    "jquery.joyride": "git+https://git@github.com/nasa-gibs/joyride.git",
     "jscrollpane": "^2.0.22",
     "lodash": "4.15.0",
     "mobiscroll-jquery": "^3.2.6",
diff --git a/web/css/main.css b/web/css/main.css
index d047f419ad..14bb75d0d3 100644
--- a/web/css/main.css
+++ b/web/css/main.css
@@ -1,6 +1,7 @@
 /* Dependency CSS */
 @import url("../../node_modules/font-awesome/css/font-awesome.css");
-@import url("../../node_modules/jquery-ui/themes/base/minified/jquery-ui.min.css");
+@import url("../../node_modules/jquery-ui/themes/base/jquery-ui.css");
+@import url("../../node_modules/jquery-ui/themes/ui-darkness/jquery-ui.css");
 @import url("../../node_modules/icheck/skins/square/grey.css");
 @import url("../../node_modules/icheck/skins/square/red.css");
 @import url("../../node_modules/icheck/skins/line/red.css");
diff --git a/web/css/tour.css b/web/css/tour.css
index 76d419707f..6e9b7f070f 100644
--- a/web/css/tour.css
+++ b/web/css/tour.css
@@ -14,6 +14,18 @@
   background-color: rgb(175, 181, 196);
 }
 
+.joyride-bordered {
+  border: #808080 solid 1px;
+}
+
+.joyride-wide {
+  width: 450px;
+}
+
+.joyride-close-tip {
+  color: rgba(38, 43, 49, 0.4) !important;
+}
+
 .tour h3 {
   color: rgb(38, 43, 49);
   font: 18px 'Open Sans', sans-serif;
@@ -139,9 +151,11 @@ button.skipTour:hover {
   vertical-align: top;
 }
 
-.tour p {
+.tour p,
+.tour ul {
   color: rgb(38, 43, 49);
   font: 400 13px/16px 'Open Sans', sans-serif;
+  margin: 0 0 14px;
 }
 
 .joyride-content-wrapper {
@@ -270,12 +284,61 @@ button.done:hover {
 
 .joyride-tip-guide {
   z-index: 293;
+  background: rgb(175, 181, 196);
+  padding-bottom: 32px;
+  width: 350px;
 }
 
 .joyride-tip-guide[data-index="0"] {
   z-index: 296;
 }
 
+.joyride-tip-guide a:hover {
+  color: #000 !important;
+  border-bottom: 0;
+}
+
+.joyride-tip-guide .joyride-next-tip,
+.joyride-tip-guide .joyride-prev-tip {
+  width: auto;
+  float: left;
+  padding: 6px 18px 4px;
+  font-size: 13px;
+  border: 1px solid #d7dada;
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+  text-align: center;
+  text-shadow: none;
+  color: #000;
+  background-color: #f4f5f5;
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f4f5f5), color-stop(100%, #dfdddd));
+  background-image: -webkit-linear-gradient(top, #f4f5f5, #dfdddd);
+  background-image: -moz-linear-gradient(top, #f4f5f5, #dfdddd);
+  background-image: -ms-linear-gradient(top, #f4f5f5, #dfdddd);
+  background-image: -o-linear-gradient(top, #f4f5f5, #dfdddd);
+  background-image: linear-gradient(to bottom, #f4f5f5, #dfdddd);
+  filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr=#f4f5f5, endColorstr=#dfdddd);
+}
+
+.joyride-tip-guide .joyride-next-tip {
+  float: right;
+}
+
+.joyride-tip-guide .joyride-next-tip:hover,
+.joyride-tip-guide .joyride-prev-tip:hover {
+  border: 1px solid #bfc4c4 !important;
+  background-color: #d9dddd;
+  color: #000;
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #d9dddd), color-stop(100%, #c6c3c3));
+  background-image: -webkit-linear-gradient(top, #d9dddd, #c6c3c3);
+  background-image: -moz-linear-gradient(top, #d9dddd, #c6c3c3);
+  background-image: -ms-linear-gradient(top, #d9dddd, #c6c3c3);
+  background-image: -o-linear-gradient(top, #d9dddd, #c6c3c3);
+  background-image: linear-gradient(to bottom, #d9dddd, #c6c3c3);
+  filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr=#d9dddd, endColorstr=#c6c3c3);
+}
+
 table.splash td.splash-info {
   vertical-align: top;
 }
@@ -289,9 +352,13 @@ table.splash td.splash-info {
 }
 
 p.wv-tour-page-count {
-  text-align: right;
-  margin-top: 7px;
   font: 400 13px/16px 'Open Sans', sans-serif;
+  color: #262b31;
+  text-align: right;
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  margin: 12px;
 }
 
 .wv-tour-visible-icon {
@@ -363,3 +430,35 @@ p.wv-tour-page-count {
 .joyride-nub-border {
   pointer-events: none;
 }
+
+.joyride-tip-guide span.joyride-nub.top {
+  border-color: #afb5c4 !important;
+  border-top-color: transparent !important;
+  border-left-color: transparent !important;
+  border-right-color: transparent !important;
+}
+
+.joyride-tip-guide span.joyride-nub.right {
+  border-color: #afb5c4 !important;
+  border-top-color: transparent !important;
+  border-right-color: transparent !important;
+  border-bottom-color: transparent !important;
+}
+
+.joyride-tip-guide span.joyride-nub.bottom {
+  border-color: #afb5c4 !important;
+  border-bottom-color: transparent !important;
+  border-left-color: transparent !important;
+  border-right-color: transparent !important;
+}
+
+.joyride-tip-guide span.joyride-nub.left {
+  border-color: #afb5c4 !important;
+  border-top-color: transparent !important;
+  border-left-color: transparent !important;
+  border-bottom-color: transparent !important;
+}
+
+.joyride-tip-guide.toolbarTip span.joyride-nub.top {
+  left: 250px;
+}
diff --git a/web/js/feedback.js b/web/js/feedback.js
index 7f9a4f871c..ac99ad0270 100644
--- a/web/js/feedback.js
+++ b/web/js/feedback.js
@@ -7,7 +7,7 @@
 
 import util from './util/util';
 
-export const feedbackModal = (function () {
+export default (function () {
   var self = {};
   var feedbackInit = false;
 
diff --git a/web/js/main.js b/web/js/main.js
index 31a4fddf0b..4910473a16 100644
--- a/web/js/main.js
+++ b/web/js/main.js
@@ -271,7 +271,7 @@ window.onload = () => {
     //  ui.naturalEvents = naturalEventsUI(models, ui, config, naturalEventsRequest(models, ui, config));
     }
     ui.link = linkUi(models, config);
-    // ui.tour = Tour(models, ui, config);
+    ui.tour = tour(models, ui, config);
     // ui.info = uiInfo(ui, config);
     if (config.features.alert) {
     //  ui.alert = notificationsUi(ui, config);
diff --git a/web/js/tour.js b/web/js/tour.js
index 87621fb606..2369b6c683 100644
--- a/web/js/tour.js
+++ b/web/js/tour.js
@@ -1,8 +1,9 @@
 import $ from 'jquery';
+import 'jquery-ui/dialog';
 import 'jquery.joyride';
 import util from './util/util';
 import wvui from './ui/ui';
-import {GA} from 'worldview-components';
+import {GA as googleAnalytics} from 'worldview-components';
 import feedbackModal from './feedback';
 
 export default function (models, ui, config) {
@@ -135,8 +136,7 @@ export default function (models, ui, config) {
         .dialog('close');
       $('#joyRideTipContent')
         .joyride({
-          adjustForPhone: false,
-          bordered: true,
+          autoStart: true,
           includepage: true,
           template: {
             'link': '<a href="#" class="joyride-close-tip">X</a>'
@@ -169,8 +169,8 @@ export default function (models, ui, config) {
     var onStop = function (index, tip, button) {
       // console.log(index, tip, button);
       setTourState();
-      GA.event('Tour', 'Click', 'Post Tour View', index + 1);
-      if (index === 5 && button !== 'previous') {
+      googleAnalytics.event('Tour', 'Click', 'Post Tour View', index + 1);
+      if (index === 5 && button === false) {
         endTour();
       }
     };
@@ -183,11 +183,10 @@ export default function (models, ui, config) {
       $('.ui-dialog-content')
         .dialog('close');
       initTourState();
-      GA.event('Tour', 'Click', 'Take Tour');
+      googleAnalytics.event('Tour', 'Click', 'Take Tour');
       $('#joyRideTipContent')
         .joyride({
-          adjustForPhone: false,
-          bordered: true,
+          autoStart: true,
           includepage: true,
           template: {
             'link': '<a href="#" class="joyride-close-tip">X</a>'
diff --git a/web/pages/tour.html b/web/pages/tour.html
index d001b73554..adc3e9c005 100644
--- a/web/pages/tour.html
+++ b/web/pages/tour.html
@@ -1,282 +1,335 @@
 <!-- INTRODUCTION -->
 
-<div id="wv-tour-intro" class="splash">
-<center>
-<p class="splashwelcome">
-This application allows you to interactively browse global satellite imagery
-within hours of it being acquired. Use the features described below to find
-interesting imagery, save and share what you find, and download the underlying
-data.
-</p>
-</br></br>
-<table id="splashTable" class="splash">
-    <tr>
+<div id="wv-tour-intro" class="splash wv-tour-intro">
+  <center>
+    <p class="splashwelcome">
+      This application allows you to interactively browse global satellite imagery within hours of it being acquired. Use the features described below to find interesting imagery, save and share what you find, and download the underlying data.
+    </p>
+    <br>
+    <table id="splashTable" class="splash">
+      <tr>
         <td><img src="images/tour/layer-picker-1.1.png" alt="Layer Picker" width="150" height="109" class="splash"/></td>
         <td><img src="images/tour/timeline-0.7.png" alt="Timeline" width="150" height="78" class="splash"/></td>
         <td><img src="images/tour/toolbar-1.4.7.png" alt="Toolbar" width="124" height="50" class="splash"/></td>
         <td><img src="images/tour/map-0.7.png" alt="Map" width="100" height="75" class="splash"/></td>
-    </tr>
-   <tr class='splash-info'>
-       <td class='splash-info'><p class="splash">Use the <span class="highlight">Layer Picker</span> on the left to choose the type of imagery to display on the map and download the underlying data. Select the Events tab to view current natural events around the world.</p></td>
-       <td class='splash-info'><p class="splash">Use the <span class="highlight">Timeline</span> on the bottom to choose the date of the observations.</p></td>
-       <td class='splash-info'><p class="splash">Use the <span class="highlight">Tool Bar</span> at the top to see other tools for changing and saving the view.</p></td>
-       <td class='splash-info'><p class="splash">Use the <span class="highlight">Map</span> itself to pan or zoom in on an area.</p></td>
-   </tr>
-   <tr>
-       <td rowspan="2" colspan="4">
-           <p style='text-align:center;'>
-               <button id='takeTour' type='button' class="takeTour">Take Tour</button>
-               <button id='skipTour' type='button' class="skipTour">Skip Tour</button>
-           </p>
-       </td>
-   </tr>
-   <tr></tr>
-   <tr id="wv-tour-skip">
-       <td colspan='2'>
-           <p id='dontShowP' class="splash">
-               <input id='dontShowAgain' type='checkbox'>
-               Do not show again (Access from
-               <i class='fa fa-info-circle fa-fw'></i> menu)
-           </p>
-       </td>
-   </tr>
-</table>
-</center>
+      </tr>
+      <tr class="splash-info">
+        <td class="splash-info">
+          <p class="splash">Use the
+            <span class="highlight">Layer Picker</span>
+            on the left to choose the type of imagery to display on the map and download the underlying data. Select the Events tab to view current natural events around the world.</p>
+        </td>
+        <td class="splash-info">
+          <p class="splash">Use the
+            <span class="highlight">Timeline</span>
+            on the bottom to choose the date of the observations.</p>
+        </td>
+        <td class="splash-info">
+          <p class="splash">Use the
+            <span class="highlight">Tool Bar</span>
+            at the top to see other tools for changing and saving the view.</p>
+        </td>
+        <td class="splash-info">
+          <p class="splash">Use the
+            <span class="highlight">Map</span>
+            itself to pan or zoom in on an area.</p>
+        </td>
+      </tr>
+      <tr>
+        <td rowspan="2" colspan="4">
+          <p style="text-align:center;">
+            <button id="takeTour" type="button" class="takeTour">Take Tour</button>
+            <button id="skipTour" type="button" class="skipTour">Skip Tour</button>
+          </p>
+        </td>
+      </tr>
+      <tr></tr>
+      <tr id="wv-tour-skip">
+        <td colspan="2">
+          <p id="dontShowP" class="splash">
+            <input id="dontShowAgain" type="checkbox">
+            Do not show again (Access from
+            <i class="fa fa-info-circle fa-fw"></i>
+            menu)
+          </p>
+        </td>
+      </tr>
+    </table>
+  </center>
 </div>
 
 <!-- TOUR PANELS -->
 <ol id="joyRideTipContent" class="tour">
 
-<!-- Timeline -->
-<li id="wv-tour-timeline" style="display: none" class="wide" data-id="timeline-footer" data-button="Next" data-options="tipLocation:top;tipAnimation:fade;nubPosition:bottom;bordered:true">
-<div class="tour">
-<h3>Timeline</h3>
-<p>
-    Use the timeline below to explore satellite imagery that is available in
-    the archive.</p>
-<table>
-    <tr>
-        <td class='wv-tour-table-icon'>
+  <!-- Timeline -->
+  <li id="wv-tour-timeline" style="display: none" class="bordered wide" data-id="timeline-footer" data-button="Next" data-options="tipLocation:top;tipAnimation:fade;nubPosition:bottom;">
+    <div class="tour">
+      <h3>Timeline</h3>
+      <p>
+        Use the timeline below to explore satellite imagery that is available in the archive.</p>
+      <table>
+        <tr>
+          <td class="wv-tour-table-icon">
             <svg width="60" height="60">
-                <defs>
-                    <clipPath id="guitarpick-boundary"><rect width="814" height="65" x="-30"></rect></clipPath>
-                </defs>
-                <g id="guitarpick" style="clip-path:url(#guitarpick-boundary);">
-                    <path d="M 7.3151,0.7426 C 3.5507,0.7426 0.5,3.7926 0.5,7.5553 l 0,21.2724 14.6038,15.7112 14.6039,15.7111 14.6038,-15.7111 14.6037,-15.7112 0,-21.2724 c 0,-3.7627 -3.051,-6.8127 -6.8151,-6.8127 l -44.785,0 z"></path>
-                    <rect width="4" height="20" x="21" y="11"></rect>
-                    <rect width="4" height="20" x="28" y="11"></rect>
-                    <rect width="4" height="20" x="35" y="11"></rect>
-                </g>
+              <defs>
+                <clippath id="guitarpick-boundary">
+                  <rect width="814" height="65" x="-30"></rect>
+                </clippath>
+              </defs>
+              <g id="guitarpick" style="clip-path:url(#guitarpick-boundary);">
+                <path d="M 7.3151,0.7426 C 3.5507,0.7426 0.5,3.7926 0.5,7.5553 l 0,21.2724 14.6038,15.7112 14.6039,15.7111 14.6038,-15.7111 14.6037,-15.7112 0,-21.2724 c 0,-3.7627 -3.051,-6.8127 -6.8151,-6.8127 l -44.785,0 z"></path>
+                <rect width="4" height="20" x="21" y="11"></rect>
+                <rect width="4" height="20" x="28" y="11"></rect>
+                <rect width="4" height="20" x="35" y="11"></rect>
+              </g>
             </svg>
-        </td>
-        <td><p>
-            The slider shows you where the selected date lies along the
-            timeline. Click and drag the slider to quickly sweep through
-            a range of dates.
-        </p></td>
-    </tr>
-    <tr>
-        <td class='wv-tour-table-icon'><i class='wv-tour-timeline-bars-icon'></i></td>
-        <td><p>
-            Click directly on the timeline to jump to a specific day. A blue
-            bar indicates a layer has imagery available. The bar
-            will be gray if the layer has been turned off and is not visible.
-        </p></td>
-    </tr>
-    <tr>
-        <td class='wv-tour-table-icon'><i class='wv-tour-timeline-interval-icon'></i></td>
-        <td><p>
-            Click on either "Days", "Months", or "Years" to expand or compress
-            the range shown on the timeline.
-        </p></td>
-    </tr>
-</table>
-<br/>
-<p><span class='tryIt'>Try It!</span></p>
-<ul>
-    <li>Change the interval to "Months" and click on July, 2012</li>
-    <li>Change the interval to "Days" and explore the imagery for that month.
-</ul>
-</div>
-</li>
+          </td>
+          <td>
+            <p>
+              The slider shows you where the selected date lies along the timeline. Click and drag the slider to quickly sweep through a range of dates.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td class="wv-tour-table-icon">
+            <i class="wv-tour-timeline-bars-icon"></i>
+          </td>
+          <td>
+            <p>
+              Click directly on the timeline to jump to a specific day. A blue bar indicates a layer has imagery available. The bar will be gray if the layer has been turned off and is not visible.
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td class="wv-tour-table-icon">
+            <i class="wv-tour-timeline-interval-icon"></i>
+          </td>
+          <td>
+            <p>
+              Click on either "Days", "Months", or "Years" to expand or compress the range shown on the timeline.
+            </p>
+          </td>
+        </tr>
+      </table>
+      <br/>
+      <p>
+        <span class="tryIt">Try It!</span></p>
+      <ul>
+        <li>Change the interval to "Months" and click on July, 2012</li>
+        <li>Change the interval to "Days" and explore the imagery for that month.</li>
+      </ul>
+    </div>
+    <p class="wv-tour-page-count">(page 1 of 6)</p>
+  </li>
 
-<!-- Timeline - Continued -->
-<li id="wv-tour-timline-continued" data-id="timeline" data-button="Next" data-options="tipLocation:top;tipAnimation:fade;nubPosition:bottom;prevButton:true;bordered:true">
-<div class="tour">
-<h3>Timeline - Continued</h3>
-<p>To the left of the timeline the selected day is shown.</p>
-<table>
-    <tr>
-        <td class='wv-tour-table-icon'><i class="wv-tour-timeline-day-buttons-icon"></i></td>
-        <td><p>Click the left and right arrows to quickly go to the previous
-        or next day.</p></td>
-    </tr>
-    <tr>
-        <td class='wv-tour-table-icon'><i class="wv-tour-timeline-entry-icon"></i></td>
-        <td><p>Buttons above each portion of the date allow you to quickly
-        go to the previous or next day, month, or year. Click on the text to
-        type in a specific date.</p></td>
-    </tr>
-</table>
-<br/>
-<p><span class='tryIt'>Try It!</span></p>
-<ul>
-    <li>Click on the button above the month to go to August.</li>
-    <li>Click on the day text, type in "23", and press the return key.</li>
-</ul>
-</div>
-</li>
+  <!-- Timeline - Continued -->
+  <li id="wv-tour-timline-continued" class="bordered" data-id="timeline" data-button="Next" data-options="tipLocation:top;tipAnimation:fade;nubPosition:bottom;prevButton:true;">
+    <div class="tour">
+      <h3>Timeline - Continued</h3>
+      <p>To the left of the timeline the selected day is shown.</p>
+      <table>
+        <tr>
+          <td class="wv-tour-table-icon">
+            <i class="wv-tour-timeline-day-buttons-icon"></i>
+          </td>
+          <td>
+            <p>Click the left and right arrows to quickly go to the previous or next day.</p>
+          </td>
+        </tr>
+        <tr>
+          <td class="wv-tour-table-icon">
+            <i class="wv-tour-timeline-entry-icon"></i>
+          </td>
+          <td>
+            <p>Buttons above each portion of the date allow you to quickly go to the previous or next day, month, or year. Click on the text to type in a specific date.</p>
+          </td>
+        </tr>
+      </table>
+      <br/>
+      <p>
+        <span class="tryIt">Try It!</span></p>
+      <ul>
+        <li>Click on the button above the month to go to August.</li>
+        <li>Click on the day text, type in "23", and press the return key.</li>
+      </ul>
+    </div>
+    <p class="wv-tour-page-count">(page 2 of 6)</p>
+  </li>
 
-<!-- Layer Picker - Base Layers -->
-<li id="wv-tour-base-layers" data-id="overlays" data-button="Next" data-options="tipLocation:right;nubPosition:left;tipAnimation:fade;prevButton:true;bordered:true">
-<div class="tour">
-<h3>Layer Picker - Base Layers</h3>
-<p>
-A <span class='highlight'>Base Layer</span> is an opaque background image -
-you can have multiple active base layers, but you can only show one at
-a time unless you adjust the individual layer settings to reduce the
-opacity of the uppermost layer(s).
-</p>
-<p>There are several ways to interact with the layers:</p>
-<ul>
-    <li>Use the <i class="wv-tour-visible-icon"></i> icon to show and hide
-        layers.</li>
-    <li>Use the <i class="wv-tour-close-icon"></i> icon to remove layers.</li>
-    <li>Drag the layers to rearrange them.</li>
-</ul>
-<p><span class='tryIt'>Try It!</span></p>
-<ul>
-    <li>Click on the <i class="wv-tour-visible-icon"></i> for
-        "Corrected Reflectance (True Color) Aqua / MODIS" under Base
-        Layers.</li>
-    <li>Drag "Corrected Reflectance (True Color) Aqua / MODIS" to the bottom
-        of the list. Notice how the map changes.</li>
-    <li>Drag "Corrected Reflectance (True Color) Aqua / MODIS" back to the
-        top of the list.</li>
-</ul>
-</div>
-</li>
+  <!-- Layer Picker - Base Layers -->
+  <li id="wv-tour-base-layers" class="bordered" data-id="overlays" data-button="Next" data-options="tipLocation:right;nubPosition:left;tipAnimation:fade;prevButton:true;">
+    <div class="tour">
+      <h3>Layer Picker - Base Layers</h3>
+      <p>
+        A
+        <span class="highlight">Base Layer</span>
+        is an opaque background image - you can have multiple active base layers, but you can only show one at a time unless you adjust the individual layer settings to reduce the opacity of the uppermost layer(s).
+      </p>
+      <p>There are several ways to interact with the layers:</p>
+      <ul>
+        <li>Use the
+          <i class="wv-tour-visible-icon"></i>
+          icon to show and hide layers.</li>
+        <li>Use the
+          <i class="wv-tour-close-icon"></i>
+          icon to remove layers.</li>
+        <li>Drag the layers to rearrange them.</li>
+      </ul>
+      <p>
+        <span class="tryIt">Try It!</span></p>
+      <ul>
+        <li>Click on the
+          <i class="wv-tour-visible-icon"></i>
+          for "Corrected Reflectance (True Color) Aqua / MODIS" under Base Layers.</li>
+        <li>Drag "Corrected Reflectance (True Color) Aqua / MODIS" to the bottom of the list. Notice how the map changes.</li>
+        <li>Drag "Corrected Reflectance (True Color) Aqua / MODIS" back to the top of the list.</li>
+      </ul>
+    </div>
+    <p class="wv-tour-page-count">(page 3 of 6)</p>
+  </li>
 
-<!-- Layer Picker - Continued -->
-<li id="wv-tour-overlay-layers" class="wide" data-id="overlays" data-button="Next" data-options="tipLocation:right;nubPosition:left;tipAnimation:fade;prevButton:true;bordered:true;class:wide">
-<div class="tour">
-<h3>Layer Picker - Continued</h3>
-<p>
-An <span class='highlight'>Overlay</span> is a partially transparent layer
-to view on top of the background - you can view multiple overlays at once.
-Click on the <i class="fa fa-sliders"></i> button to adjust the opacity.
-If the overlay has a color bar, the palette can also be changed here.
-<p>
-On the Add Layers (<i class="fa fa-plus"></i><b> Add Layers</b>) screen, you can search through categories
-or by keywords to find and add layers.
-</p>
-<p>
-On the <i class="fa fa-download"></i> tab, you can download data for
-layers you are currently viewing.
-</p>
-<p>
-<span class='tryIt'>Try It!</span>
-</p>
-<ul>
-    <li>Click on the <i class="fa fa-plus fa"></i><b> Add Layers</b> button</li>
-    <li>Type "aqua fires" in the search box.</li>
-    <li>Add the "Fires and Thermal Anomalies (Day and Night) Aqua/MODIS"
-        overlay by clicking on it.</li>
-    <li>Click on the <i class="fa fa-download"></i> tab to see what data
-        can be downloaded.</li>
-    <li>Click on the <i class="wv-tour-active-icon"></i> tab to see the layers
-        that have been added.</li>
-</ul>
-</div>
-</li>
+  <!-- Layer Picker - Continued -->
+  <li id="wv-tour-overlay-layers" class="bordered wide" data-id="overlays" data-button="Next" data-options="tipLocation:right;nubPosition:left;tipAnimation:fade;prevButton:true;">
+    <div class="tour">
+      <h3>Layer Picker - Continued</h3>
+      <p>
+        An
+        <span class="highlight">Overlay</span>
+        is a partially transparent layer to view on top of the background - you can view multiple overlays at once. Click on the
+        <i class="fa fa-sliders"></i>
+        button to adjust the opacity. If the overlay has a color bar, the palette can also be changed here.
+      </p>
+      <p>
+        On the Add Layers (<i class="fa fa-plus"></i>
+        <b>
+          Add Layers</b>) screen, you can search through categories or by keywords to find and add layers.
+      </p>
+      <p>
+        On the
+        <i class="fa fa-download"></i>
+        tab, you can download data for layers you are currently viewing.
+      </p>
+      <p>
+        <span class="tryIt">Try It!</span>
+      </p>
+      <ul>
+        <li>Click on the
+          <i class="fa fa-plus fa"></i>
+          <b>
+            Add Layers</b>
+          button</li>
+        <li>Type "aqua fires" in the search box.</li>
+        <li>Add the "Fires and Thermal Anomalies (Day and Night) Aqua/MODIS" overlay by clicking on it.</li>
+        <li>Click on the
+          <i class="fa fa-download"></i>
+          tab to see what data can be downloaded.</li>
+        <li>Click on the
+          <i class="wv-tour-active-icon"></i>
+          tab to see the layers that have been added.</li>
+      </ul>
+    </div>
+    <p class="wv-tour-page-count">(page 4 of 6)</p>
+  </li>
 
-<!-- Map -->
-<li id="wv-tour-map" data-id="mapPanelTourAnchor" data-button="Next" data-options="tipLocation:left;nubPosition:left;prevButton:true;bordered:true">
-<div class="tour">
-<h3>Map</h3>
-<p>
-There are several ways you can interact with the map to pan or zoom.
-</p>
-<p>
-To pan, drag the map.
-</p>
-<p>
-To zoom:
-</p>
-<ul>
-    <li>Use the mouse wheel</li>
-    <li>Use the +/- icons on the right</li>
-    <li>Double-click (zooms to location)</li>
-    <li>Shift-click-drag (zooms in on a box)</li>
-</ul>
-<p>
-<span class='tryIt'>Try It!</span>
-</p>
-<p>
-Move the map to North America and zoom in on northern California, USA.
-</p>
-<img src="images/tour-fire-location.png" alt="Location" class="wv-tour-map"/>
-</li>
+  <!-- Map -->
+  <li id="wv-tour-map" class="bordered" data-id="mapPanelTourAnchor" data-button="Next" data-options="tipLocation:left;nubPosition:left;prevButton:true;">
+    <div class="tour">
+      <h3>Map</h3>
+      <p>
+        There are several ways you can interact with the map to pan or zoom.
+      </p>
+      <p>
+        To pan, drag the map.
+      </p>
+      <p>
+        To zoom:
+      </p>
+      <ul>
+        <li>Use the mouse wheel</li>
+        <li>Use the +/- icons on the right</li>
+        <li>Double-click (zooms to location)</li>
+        <li>Shift-click-drag (zooms in on a box)</li>
+      </ul>
+      <p>
+        <span class="tryIt">Try It!</span>
+      </p>
+      <p>
+        Move the map to North America and zoom in on northern California, USA.
+      </p>
+      <img src="images/tour-fire-location.png" alt="Location" class="wv-tour-map"/>
+    </div>
+    <p class="wv-tour-page-count">(page 5 of 6)</p>
+  </li>
 
-<!-- Toolbar -->
-<li id="wv-tour-toolbar" class="toolbarTip" data-id="wv-toolbar" data-button="Finish" data-options="tipLocation:bottom;nubPosition:top;tipAnimation:fade;prevButton:true;bordered:true;class:toolbar">
-<div class="tour">
-<h3>Toolbar</h3>
-<p>
-The toolbar provides several additional utilities for interacting with @NAME@.
-</p>
-<table>
-    <tr>
-        <td class='wv-tour-table-icon'><i class='fa fa-share-square-o fa-2x wv-tour-toolbar-icon'></i></td>
-        <td><p>The permalink button lets you create a permanent, shareable link
-            to a particular view in @NAME@.</p></td>
-    </tr>
-    <tr>
-        <td class='wv-tour-table-icon'><i class='fa fa-globe fa-2x wv-tour-toolbar-icon'></i></td>
-        <td><p>The globe button lets you change between Arctic, geographic, and
-            Antarctic projections of the world.</p></td>
-    </tr>
-    <tr>
-        <td class='wv-tour-table-icon'><i class='fa fa-camera fa-2x wv-tour-toolbar-icon'></i></td>
-        <td><p>The camera button lets you download an image of your current view
-            in @NAME@. User-selected palettes are not yet supported with this
-            feature.</p></td>
-    </tr>
-    <tr>
-        <td class='wv-tour-table-icon'><i class='fa fa-info-circle fa-2x wv-tour-toolbar-icon'></i></td>
-        <td><p>The information button provides you with more information on
-            @NAME@ and its data sources.</p></td>
-    </tr>
-</table>
-</div>
-</li>
+  <!-- Toolbar -->
+  <li id="wv-tour-toolbar" class="bordered toolbarTip" data-id="wv-toolbar" data-button="Finish" data-options="tipLocation:bottom;nubPosition:top;tipAnimation:fade;prevButton:true;">
+    <div class="tour">
+      <h3>Toolbar</h3>
+      <p>
+        The toolbar provides several additional utilities for interacting with @NAME@.
+      </p>
+      <table>
+        <tr>
+          <td class="wv-tour-table-icon">
+            <i class="fa fa-share-square-o fa-2x wv-tour-toolbar-icon"></i>
+          </td>
+          <td>
+            <p>The permalink button lets you create a permanent, shareable link to a particular view in @NAME@.</p>
+          </td>
+        </tr>
+        <tr>
+          <td class="wv-tour-table-icon">
+            <i class="fa fa-globe fa-2x wv-tour-toolbar-icon"></i>
+          </td>
+          <td>
+            <p>The globe button lets you change between Arctic, geographic, and Antarctic projections of the world.</p>
+          </td>
+        </tr>
+        <tr>
+          <td class="wv-tour-table-icon">
+            <i class="fa fa-camera fa-2x wv-tour-toolbar-icon"></i>
+          </td>
+          <td>
+            <p>The camera button lets you download an image of your current view in @NAME@. User-selected palettes are not yet supported with this feature.</p>
+          </td>
+        </tr>
+        <tr>
+          <td class="wv-tour-table-icon">
+            <i class="fa fa-info-circle fa-2x wv-tour-toolbar-icon"></i>
+          </td>
+          <td>
+            <p>The information button provides you with more information on @NAME@ and its data sources.</p>
+          </td>
+        </tr>
+      </table>
+    </div>
+    <p class="wv-tour-page-count">(page 6 of 6)</p>
+  </li>
 
 </ol>
 
 <!-- TOUR END -->
 <div id="wv-tour-end" class="splash">
-<center>
-<p class='splashwelcome'>
-     You have now completed a tour of @NAME@!  If you followed the “Try It”
-     steps, you’re now looking at fires in northern California as they were
-     observed by satellites on August 23, 2012. You can use the tools in any
-     order.  We hope you continue exploring!
-</p>
-<br/>
-<p class='splashwelcome'>
-    <a class='feedback'>Contact us</a> if you have any questions
-    about @NAME@.
-</p>
-<br/>
-<table class='tour'>
-    <tr>
+  <center>
+    <p class="splashwelcome">
+      You have now completed a tour of @NAME@! If you followed the “Try It” steps, you’re now looking at fires in northern California as they were observed by satellites on August 23, 2012. You can use the tools in any order. We hope you continue
+      exploring!
+    </p>
+    <br/>
+    <p class="splashwelcome">
+      <a class="feedback">Contact us</a>
+      if you have any questions about @NAME@.
+    </p>
+    <br/>
+    <table class="tour">
+      <tr>
         <td rowspan="2" colspan="2">
-            <button id='repeat' type='button' class='repeatTour'>Repeat Tour</button>
+          <button id="repeat" type="button" class="repeatTour">Repeat Tour</button>
         </td>
         <td rowspan="2" colspan="2">
-            <button id='done' type='button' class='done'>Done!</button>
+          <button id="done" type="button" class="done">Done!</button>
         </td>
-    </tr>
-</table>
-</center>
+      </tr>
+    </table>
+  </center>
 </div>