diff --git a/Gemfile b/Gemfile
index 0124fd90dd..99ecd9331a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 group :development, :test do
-  gem 'jekyll', '~> 3.1.0'
+  gem 'jekyll', '~> 3.1.1'
   gem 'jekyll-redirect-from', '~> 0.9.1'
   gem 'jekyll-sitemap', '~> 0.10.0'
   gem 'sass', '~> 3.4.21'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1bcdf05e5b..8a381d8101 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,7 +4,7 @@ GEM
     colorator (0.1)
     ffi (1.9.10)
     ffi (1.9.10-x64-mingw32)
-    jekyll (3.1.0)
+    jekyll (3.1.1)
       colorator (~> 0.1)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
@@ -28,7 +28,7 @@ GEM
     mercenary (0.3.5)
     rake (10.5.0)
     rb-fsevent (0.9.7)
-    rb-inotify (0.9.5)
+    rb-inotify (0.9.6)
       ffi (>= 0.5.0)
     rouge (1.10.1)
     safe_yaml (1.0.4)
@@ -42,7 +42,7 @@ PLATFORMS
   x64-mingw32
 
 DEPENDENCIES
-  jekyll (~> 3.1.0)
+  jekyll (~> 3.1.1)
   jekyll-redirect-from (~> 0.9.1)
   jekyll-sitemap (~> 0.10.0)
   sass (~> 3.4.21)
diff --git a/docs/_includes/nav-docs.html b/docs/_includes/nav-docs.html
index fa29841883..b4f4d1f9ec 100644
--- a/docs/_includes/nav-docs.html
+++ b/docs/_includes/nav-docs.html
@@ -25,6 +25,7 @@
       <ul class="nav bd-sidenav">
         {% for doc in group.pages %}
           {% assign slug = doc.title | downcase | replace: ' ', '-' | replace:'-&-','-' %}
+          {% capture slug %}/{{ slug }}{% endcapture %}
           {% assign active = nil %}
 
           {% if page.url contains slug %}
diff --git a/docs/assets/scss/_ads.scss b/docs/assets/scss/_ads.scss
index 8876e5bfb6..405cac30ae 100644
--- a/docs/assets/scss/_ads.scss
+++ b/docs/assets/scss/_ads.scss
@@ -1,3 +1,5 @@
+// scss-lint:disable ImportantRule
+
 //
 // Carbon ads
 //
diff --git a/docs/assets/scss/_callouts.scss b/docs/assets/scss/_callouts.scss
index 0ba52fd848..401bfd6f52 100644
--- a/docs/assets/scss/_callouts.scss
+++ b/docs/assets/scss/_callouts.scss
@@ -10,13 +10,16 @@
   border-left-width: .25rem;
   border-radius: .25rem;
 }
+
 .bd-callout h4 {
   margin-top: 0;
   margin-bottom: .25rem;
 }
+
 .bd-callout p:last-child {
   margin-bottom: 0;
 }
+
 .bd-callout code {
   border-radius: .25rem;
 }
@@ -31,6 +34,7 @@
 
   h4 { color: $color; }
 }
-.bd-callout-info    { @include bs-callout-variant($bd-info); }
+
+.bd-callout-info { @include bs-callout-variant($bd-info); }
 .bd-callout-warning { @include bs-callout-variant($bd-warning); }
-.bd-callout-danger  { @include bs-callout-variant($bd-danger); }
+.bd-callout-danger { @include bs-callout-variant($bd-danger); }
diff --git a/docs/assets/scss/_content.scss b/docs/assets/scss/_content.scss
index 4e753dd04f..28f4cd4422 100644
--- a/docs/assets/scss/_content.scss
+++ b/docs/assets/scss/_content.scss
@@ -1,4 +1,4 @@
-// scss-lint:disable IdSelector
+// scss-lint:disable IdSelector, NestingDepth, SelectorDepth
 
 //
 // Automatically style Markdown-based tables like a Bootstrap `.table`.
diff --git a/docs/assets/scss/_masthead.scss b/docs/assets/scss/_masthead.scss
index efbd5c649c..f0ebe93638 100644
--- a/docs/assets/scss/_masthead.scss
+++ b/docs/assets/scss/_masthead.scss
@@ -1,3 +1,5 @@
+// scss-lint:disable ImportantRule
+
 .bd-masthead {
   position: relative;
   padding: 3rem ($grid-gutter-width / 2) 2rem;
diff --git a/docs/assets/scss/_page-header.scss b/docs/assets/scss/_page-header.scss
index 2934460a97..457d3fbef8 100644
--- a/docs/assets/scss/_page-header.scss
+++ b/docs/assets/scss/_page-header.scss
@@ -1,3 +1,5 @@
+// scss-lint:disable ImportantRule
+
 .bd-pageheader {
   padding: 2rem ($grid-gutter-width / 2);
   margin-bottom: 1.5rem;
diff --git a/docs/assets/scss/_responsive-tests.scss b/docs/assets/scss/_responsive-tests.scss
index 0bdd6632db..79fe721bb7 100644
--- a/docs/assets/scss/_responsive-tests.scss
+++ b/docs/assets/scss/_responsive-tests.scss
@@ -1,3 +1,5 @@
+// scss-lint:disable ImportantRule
+
 //
 // Responsive tests
 //
@@ -20,11 +22,11 @@
 .responsive-utilities td {
   text-align: center;
 }
-.responsive-utilities td.is-visible {
+.responsive-utilities .is-visible {
   color: #468847;
   background-color: #dff0d8 !important;
 }
-.responsive-utilities td.is-hidden {
+.responsive-utilities .is-hidden {
   color: #ccc;
   background-color: #f9f9f9 !important;
 }
diff --git a/docs/layout/grid.md b/docs/layout/grid.md
index c318f5330a..f2427137f1 100644
--- a/docs/layout/grid.md
+++ b/docs/layout/grid.md
@@ -164,23 +164,40 @@ Mixins are used in conjunction with the grid variables to generate semantic CSS
 {% highlight scss %}
 // Creates a wrapper for a series of columns
 @mixin make-row($gutter: $grid-gutter-width) {
+  @if $enable-flex {
+    display: flex;
+    flex-wrap: wrap;
+  } @else {
+    @include clearfix();
+  }
   margin-left:  ($gutter / -2);
   margin-right: ($gutter / -2);
-  @include clearfix();
 }
 
 // Make the element grid-ready (applying everything but the width)
 @mixin make-col($gutter: $grid-gutter-width) {
   position: relative;
-  float: left;
+  @if $enable-flex {
+    flex: 1;
+  } @else {
+    float: left;
+  }
   min-height: 1px;
   padding-left:  ($gutter / 2);
   padding-right: ($gutter / 2);
 }
 
-// Set a width (to be used in or out of media queries)
-@mixin make-col-span($columns) {
-  width: percentage(($columns / $grid-columns));
+@mixin make-col-span($size, $columns: $grid-columns) {
+  // Set a width (to be used in or out of media queries)
+  @if $enable-flex {
+    flex: 0 0 percentage($size / $columns);
+    // Add a `max-width` to ensure content within each column does not blow out
+    // the width of the column. Applies to IE10+ and Firefox. Chrome and Safari
+    // do not appear to require this.
+    max-width: percentage($size / $columns);
+  } @else {
+    width: percentage($size / $columns);
+  }
 }
 
 // Get fancy by offsetting, or changing the sort order
diff --git a/grunt/npm-shrinkwrap.json b/grunt/npm-shrinkwrap.json
index 048b8e3fe3..0125adf31b 100644
--- a/grunt/npm-shrinkwrap.json
+++ b/grunt/npm-shrinkwrap.json
@@ -25,8 +25,8 @@
       "resolved": "https://registry.npmjs.org/acorn-to-esprima/-/acorn-to-esprima-1.0.7.tgz"
     },
     "adm-zip": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz"
+      "version": "0.4.7",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz"
     },
     "align-text": {
       "version": "0.1.4",
@@ -123,12 +123,12 @@
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"
     },
     "asn1": {
-      "version": "0.1.11",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
     },
     "assert-plus": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
     },
     "ast-traverse": {
       "version": "0.1.1",
@@ -155,12 +155,8 @@
       "resolved": "https://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz"
     },
     "aws-sign2": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
-    },
-    "aws4": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.2.1.tgz"
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
     },
     "babel-core": {
       "version": "5.8.35",
@@ -251,8 +247,8 @@
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz"
     },
     "bl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.1.tgz",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.2.tgz",
       "dependencies": {
         "readable-stream": {
           "version": "2.0.5",
@@ -269,8 +265,8 @@
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz"
     },
     "boom": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
     },
     "brace-expansion": {
       "version": "1.1.2",
@@ -319,16 +315,16 @@
       "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz"
     },
     "caniuse-db": {
-      "version": "1.0.30000404",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000404.tgz"
+      "version": "1.0.30000407",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000407.tgz"
     },
     "cardinal": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/cardinal/-/cardinal-0.5.0.tgz"
     },
     "caseless": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
     },
     "center-align": {
       "version": "0.1.3",
@@ -407,8 +403,8 @@
       "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
     },
     "combined-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"
     },
     "commander": {
       "version": "2.9.0",
@@ -507,8 +503,8 @@
       "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.1.tgz"
     },
     "cryptiles": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
     },
     "css-mq-parser": {
       "version": "0.0.3",
@@ -552,13 +548,7 @@
     },
     "dashdash": {
       "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.12.2.tgz",
-      "dependencies": {
-        "assert-plus": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
-        }
-      }
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.12.2.tgz"
     },
     "date-time": {
       "version": "1.0.0",
@@ -597,8 +587,8 @@
       "resolved": "https://registry.npmjs.org/del/-/del-2.2.0.tgz"
     },
     "delayed-stream": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
     },
     "delegates": {
       "version": "1.0.0",
@@ -745,8 +735,8 @@
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-1.10.3.tgz",
       "dependencies": {
         "argparse": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.4.tgz"
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.5.tgz"
         },
         "espree": {
           "version": "2.2.5",
@@ -770,14 +760,14 @@
             }
           }
         },
-        "lodash": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.2.0.tgz"
-        },
         "minimatch": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz"
         },
+        "shelljs": {
+          "version": "0.5.3",
+          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz"
+        },
         "user-home": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz"
@@ -913,20 +903,16 @@
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.0.10.tgz"
     },
     "forever-agent": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
     },
     "form-data": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+      "version": "1.0.0-rc3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
       "dependencies": {
         "async": {
-          "version": "0.9.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
-        },
-        "mime": {
-          "version": "1.2.11",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
         }
       }
     },
@@ -935,8 +921,8 @@
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz"
     },
     "fs-extra": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.23.1.tgz"
+      "version": "0.26.5",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.5.tgz"
     },
     "fs-readdir-recursive": {
       "version": "0.1.2",
@@ -1059,8 +1045,8 @@
       "resolved": "https://registry.npmjs.org/grunt-build-control/-/grunt-build-control-0.6.2.tgz",
       "dependencies": {
         "bluebird": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.2.1.tgz"
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.2.2.tgz"
         },
         "shelljs": {
           "version": "0.2.6",
@@ -1129,8 +1115,8 @@
       "resolved": "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.14.0.tgz"
     },
     "grunt-contrib-qunit": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/grunt-contrib-qunit/-/grunt-contrib-qunit-0.7.0.tgz"
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-qunit/-/grunt-contrib-qunit-1.0.1.tgz"
     },
     "grunt-contrib-sass": {
       "version": "0.9.2",
@@ -1175,16 +1161,16 @@
           "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-3.0.0.tgz"
         },
         "lodash": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.2.0.tgz"
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.2.1.tgz"
         },
         "maxmin": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/maxmin/-/maxmin-2.1.0.tgz"
         },
         "pretty-bytes": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-3.0.0.tgz"
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-3.0.1.tgz"
         }
       }
     },
@@ -1237,8 +1223,8 @@
       "resolved": "https://registry.npmjs.org/grunt-jekyll/-/grunt-jekyll-0.4.3.tgz"
     },
     "grunt-jscs": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/grunt-jscs/-/grunt-jscs-2.6.0.tgz"
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/grunt-jscs/-/grunt-jscs-2.7.0.tgz"
     },
     "grunt-legacy-log": {
       "version": "0.1.3",
@@ -1279,14 +1265,8 @@
       }
     },
     "grunt-lib-phantomjs": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/grunt-lib-phantomjs/-/grunt-lib-phantomjs-0.6.0.tgz",
-      "dependencies": {
-        "semver": {
-          "version": "1.0.14",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-1.0.14.tgz"
-        }
-      }
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/grunt-lib-phantomjs/-/grunt-lib-phantomjs-1.0.0.tgz"
     },
     "grunt-line-remover": {
       "version": "0.0.2",
@@ -1375,16 +1355,16 @@
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.0.tgz"
     },
     "hawk": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz"
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"
     },
     "heap": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/heap/-/heap-0.2.6.tgz"
     },
     "hoek": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+      "version": "2.16.3",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
     },
     "home-or-tmp": {
       "version": "1.0.0",
@@ -1413,8 +1393,8 @@
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz"
     },
     "http-signature": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"
     },
     "i": {
       "version": "0.3.4",
@@ -1565,18 +1545,12 @@
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
     },
     "jscs": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/jscs/-/jscs-2.8.0.tgz",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/jscs/-/jscs-2.9.0.tgz",
       "dependencies": {
         "argparse": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.4.tgz",
-          "dependencies": {
-            "lodash": {
-              "version": "4.2.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.2.0.tgz"
-            }
-          }
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.5.tgz"
         },
         "esprima": {
           "version": "2.7.2",
@@ -1675,13 +1649,17 @@
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz"
     },
     "kew": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/kew/-/kew-0.4.0.tgz"
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz"
     },
     "kind-of": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.2.tgz"
     },
+    "klaw": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.1.3.tgz"
+    },
     "lazy-cache": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.3.tgz"
@@ -1815,8 +1793,8 @@
       "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-3.0.2.tgz"
     },
     "lodash.isarguments": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.5.tgz"
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.6.tgz"
     },
     "lodash.isarray": {
       "version": "3.0.4",
@@ -1827,8 +1805,8 @@
       "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-3.2.0.tgz"
     },
     "lodash.istypedarray": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash.istypedarray/-/lodash.istypedarray-3.0.3.tgz"
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.istypedarray/-/lodash.istypedarray-3.0.4.tgz"
     },
     "lodash.keys": {
       "version": "3.1.2",
@@ -1847,8 +1825,8 @@
       "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-3.1.0.tgz"
     },
     "lodash.pad": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.2.1.tgz"
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.2.2.tgz"
     },
     "lodash.padleft": {
       "version": "3.1.1",
@@ -1863,8 +1841,8 @@
       "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-3.1.0.tgz"
     },
     "lodash.repeat": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.1.1.tgz"
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.1.2.tgz"
     },
     "lodash.restparam": {
       "version": "3.6.1",
@@ -1895,16 +1873,12 @@
       "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-5.1.0.tgz",
       "dependencies": {
         "argparse": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.4.tgz"
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.5.tgz"
         },
         "entities": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"
-        },
-        "lodash": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.2.0.tgz"
         }
       }
     },
@@ -2070,89 +2044,13 @@
       "version": "3.4.2",
       "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-3.4.2.tgz",
       "dependencies": {
-        "assert-plus": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
-        },
-        "async": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
-        },
-        "aws-sign2": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
-        },
-        "boom": {
-          "version": "2.10.1",
-          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
-        },
-        "caseless": {
-          "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
-        },
-        "combined-stream": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"
-        },
         "cross-spawn": {
           "version": "2.1.5",
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-2.1.5.tgz"
         },
-        "cryptiles": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
-        },
-        "delayed-stream": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
-        },
-        "forever-agent": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
-        },
-        "form-data": {
-          "version": "1.0.0-rc3",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz"
-        },
         "glob": {
           "version": "5.0.15",
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"
-        },
-        "hawk": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"
-        },
-        "hoek": {
-          "version": "2.16.3",
-          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
-        },
-        "http-signature": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"
-        },
-        "nopt": {
-          "version": "3.0.6",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"
-        },
-        "npmconf": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz"
-        },
-        "oauth-sign": {
-          "version": "0.8.1",
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz"
-        },
-        "qs": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz"
-        },
-        "request": {
-          "version": "2.69.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.69.0.tgz"
-        },
-        "sntp": {
-          "version": "1.0.9",
-          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
         }
       }
     },
@@ -2205,16 +2103,16 @@
       "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz"
     },
     "npm": {
-      "version": "2.14.17",
-      "resolved": "https://registry.npmjs.org/npm/-/npm-2.14.17.tgz",
+      "version": "2.14.18",
+      "resolved": "https://registry.npmjs.org/npm/-/npm-2.14.18.tgz",
       "dependencies": {
         "abbrev": {
           "version": "1.0.7",
           "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
         },
         "ansi": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz"
         },
         "ansi-regex": {
           "version": "2.0.0",
@@ -2263,20 +2161,20 @@
           }
         },
         "columnify": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.5.2.tgz",
+          "version": "1.5.4",
+          "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.5.4.tgz",
           "dependencies": {
             "wcwidth": {
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz",
               "dependencies": {
                 "defaults": {
-                  "version": "1.0.2",
-                  "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.2.tgz",
+                  "version": "1.0.3",
+                  "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
                   "dependencies": {
                     "clone": {
-                      "version": "0.1.19",
-                      "resolved": "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz"
+                      "version": "1.0.2",
+                      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"
                     }
                   }
                 }
@@ -2285,8 +2183,8 @@
           }
         },
         "config-chain": {
-          "version": "1.1.9",
-          "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz",
+          "version": "1.1.10",
+          "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.10.tgz",
           "dependencies": {
             "proto-list": {
               "version": "1.2.4",
@@ -2313,8 +2211,14 @@
           "resolved": "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.7.tgz"
         },
         "fs-write-stream-atomic": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.5.tgz"
+          "version": "1.0.8",
+          "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.8.tgz",
+          "dependencies": {
+            "iferr": {
+              "version": "0.1.5",
+              "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz"
+            }
+          }
         },
         "fstream": {
           "version": "1.0.8",
@@ -2349,8 +2253,8 @@
           }
         },
         "graceful-fs": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
+          "version": "4.1.3",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.3.tgz"
         },
         "hosted-git-info": {
           "version": "2.1.4",
@@ -2373,9 +2277,19 @@
           "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
         },
         "init-package-json": {
-          "version": "1.9.1",
-          "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.1.tgz",
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.3.tgz",
           "dependencies": {
+            "glob": {
+              "version": "6.0.4",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
+              "dependencies": {
+                "path-is-absolute": {
+                  "version": "1.0.0",
+                  "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                }
+              }
+            },
             "promzard": {
               "version": "0.3.0",
               "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"
@@ -2743,6 +2657,10 @@
                   "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
                 }
               }
+            },
+            "retry": {
+              "version": "0.8.0",
+              "resolved": "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"
             }
           }
         },
@@ -2751,44 +2669,34 @@
           "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.2.tgz"
         },
         "npmlog": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-2.0.0.tgz",
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-2.0.2.tgz",
           "dependencies": {
             "are-we-there-yet": {
-              "version": "1.0.4",
-              "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
+              "version": "1.0.6",
+              "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.6.tgz",
               "dependencies": {
                 "delegates": {
-                  "version": "0.1.0",
-                  "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
+                  "version": "1.0.0",
+                  "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"
                 }
               }
             },
             "gauge": {
-              "version": "1.2.2",
-              "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
+              "version": "1.2.5",
+              "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.5.tgz",
               "dependencies": {
                 "has-unicode": {
-                  "version": "1.0.1",
-                  "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
+                  "version": "2.0.0",
+                  "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.0.tgz"
                 },
                 "lodash.pad": {
-                  "version": "3.1.1",
-                  "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.2.2.tgz",
                   "dependencies": {
-                    "lodash._basetostring": {
-                      "version": "3.0.1",
-                      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-                    },
-                    "lodash._createpadding": {
-                      "version": "3.6.1",
-                      "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-                      "dependencies": {
-                        "lodash.repeat": {
-                          "version": "3.0.1",
-                          "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
-                        }
-                      }
+                    "lodash.repeat": {
+                      "version": "3.1.2",
+                      "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.1.2.tgz"
                     }
                   }
                 },
@@ -2805,8 +2713,8 @@
                       "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
                       "dependencies": {
                         "lodash.repeat": {
-                          "version": "3.0.1",
-                          "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                          "version": "3.1.2",
+                          "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.1.2.tgz"
                         }
                       }
                     }
@@ -2825,8 +2733,8 @@
                       "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
                       "dependencies": {
                         "lodash.repeat": {
-                          "version": "3.0.1",
-                          "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+                          "version": "3.1.2",
+                          "resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.1.2.tgz"
                         }
                       }
                     }
@@ -2891,9 +2799,19 @@
           }
         },
         "read-package-json": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.2.tgz",
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.3.tgz",
           "dependencies": {
+            "glob": {
+              "version": "6.0.4",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
+              "dependencies": {
+                "path-is-absolute": {
+                  "version": "1.0.0",
+                  "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                }
+              }
+            },
             "json-parse-helpfulerror": {
               "version": "1.0.3",
               "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
@@ -2929,20 +2847,30 @@
           "resolved": "https://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.1.tgz"
         },
         "request": {
-          "version": "2.67.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.67.0.tgz",
+          "version": "2.69.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.69.0.tgz",
           "dependencies": {
             "aws-sign2": {
               "version": "0.6.0",
               "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
             },
+            "aws4": {
+              "version": "1.2.1",
+              "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.2.1.tgz",
+              "dependencies": {
+                "lru-cache": {
+                  "version": "2.7.3",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+                }
+              }
+            },
             "bl": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.2.tgz",
               "dependencies": {
                 "readable-stream": {
-                  "version": "2.0.4",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
+                  "version": "2.0.5",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.5.tgz",
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.2",
@@ -2995,14 +2923,14 @@
               "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
               "dependencies": {
                 "async": {
-                  "version": "1.5.0",
-                  "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
+                  "version": "1.5.2",
+                  "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
                 }
               }
             },
             "har-validator": {
-              "version": "2.0.3",
-              "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.3.tgz",
+              "version": "2.0.6",
+              "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
               "dependencies": {
                 "chalk": {
                   "version": "1.1.1",
@@ -3013,8 +2941,8 @@
                       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
                     },
                     "escape-string-regexp": {
-                      "version": "1.0.3",
-                      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+                      "version": "1.0.4",
+                      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.4.tgz"
                     },
                     "has-ansi": {
                       "version": "2.0.0",
@@ -3037,8 +2965,8 @@
                   }
                 },
                 "is-my-json-valid": {
-                  "version": "2.12.3",
-                  "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz",
+                  "version": "2.12.4",
+                  "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.4.tgz",
                   "dependencies": {
                     "generate-function": {
                       "version": "2.0.0",
@@ -3069,16 +2997,16 @@
                   "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
                   "dependencies": {
                     "pinkie": {
-                      "version": "2.0.1",
-                      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"
+                      "version": "2.0.4",
+                      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
                     }
                   }
                 }
               }
             },
             "hawk": {
-              "version": "3.1.2",
-              "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.2.tgz",
+              "version": "3.1.3",
+              "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
               "dependencies": {
                 "boom": {
                   "version": "2.10.1",
@@ -3099,12 +3027,12 @@
               }
             },
             "http-signature": {
-              "version": "1.1.0",
-              "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.0.tgz",
+              "version": "1.1.1",
+              "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
               "dependencies": {
                 "assert-plus": {
-                  "version": "0.1.5",
-                  "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+                  "version": "0.2.0",
+                  "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
                 },
                 "jsprim": {
                   "version": "1.2.2",
@@ -3125,26 +3053,16 @@
                   }
                 },
                 "sshpk": {
-                  "version": "1.7.1",
-                  "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.1.tgz",
+                  "version": "1.7.3",
+                  "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.3.tgz",
                   "dependencies": {
                     "asn1": {
                       "version": "0.2.3",
                       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
                     },
-                    "assert-plus": {
-                      "version": "0.2.0",
-                      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
-                    },
                     "dashdash": {
-                      "version": "1.10.1",
-                      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz",
-                      "dependencies": {
-                        "assert-plus": {
-                          "version": "0.1.5",
-                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
-                        }
-                      }
+                      "version": "1.12.2",
+                      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.12.2.tgz"
                     },
                     "ecc-jsbn": {
                       "version": "0.1.1",
@@ -3159,8 +3077,8 @@
                       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
                     },
                     "tweetnacl": {
-                      "version": "0.13.2",
-                      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.2.tgz"
+                      "version": "0.13.3",
+                      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz"
                     }
                   }
                 }
@@ -3179,12 +3097,12 @@
               "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
             },
             "mime-types": {
-              "version": "2.1.8",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.8.tgz",
+              "version": "2.1.9",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz",
               "dependencies": {
                 "mime-db": {
-                  "version": "1.20.0",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.20.0.tgz"
+                  "version": "1.21.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz"
                 }
               }
             },
@@ -3193,12 +3111,12 @@
               "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
             },
             "oauth-sign": {
-              "version": "0.8.0",
-              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
+              "version": "0.8.1",
+              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz"
             },
             "qs": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz"
+              "version": "6.0.2",
+              "resolved": "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz"
             },
             "stringstream": {
               "version": "0.0.5",
@@ -3215,12 +3133,24 @@
           }
         },
         "retry": {
-          "version": "0.8.0",
-          "resolved": "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"
+          "version": "0.9.0",
+          "resolved": "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz"
         },
         "rimraf": {
-          "version": "2.4.4",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz"
+          "version": "2.5.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.1.tgz",
+          "dependencies": {
+            "glob": {
+              "version": "6.0.4",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
+              "dependencies": {
+                "path-is-absolute": {
+                  "version": "1.0.0",
+                  "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+                }
+              }
+            }
+          }
         },
         "semver": {
           "version": "5.1.0",
@@ -3267,8 +3197,8 @@
           "resolved": "https://registry.npmjs.org/sorted-object/-/sorted-object-1.0.0.tgz"
         },
         "spdx-license-ids": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.0.tgz"
         },
         "strip-ansi": {
           "version": "3.0.0",
@@ -3321,8 +3251,8 @@
           }
         },
         "which": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.2.0.tgz",
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.2.4.tgz",
           "dependencies": {
             "is-absolute": {
               "version": "0.1.7",
@@ -3333,6 +3263,10 @@
                   "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
                 }
               }
+            },
+            "isexe": {
+              "version": "1.1.1",
+              "resolved": "https://registry.npmjs.org/isexe/-/isexe-1.1.1.tgz"
             }
           }
         },
@@ -3351,8 +3285,8 @@
       "resolved": "https://registry.npmjs.org/npm-shrinkwrap/-/npm-shrinkwrap-200.4.0.tgz"
     },
     "npmconf": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-2.1.1.tgz",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz",
       "dependencies": {
         "nopt": {
           "version": "3.0.6",
@@ -3373,8 +3307,8 @@
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
     },
     "oauth-sign": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz"
     },
     "object-assign": {
       "version": "4.0.1",
@@ -3487,8 +3421,14 @@
       "resolved": "https://registry.npmjs.org/pathval/-/pathval-0.1.1.tgz"
     },
     "phantomjs": {
-      "version": "1.9.19",
-      "resolved": "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.19.tgz"
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/phantomjs/-/phantomjs-2.1.3.tgz",
+      "dependencies": {
+        "which": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.2.4.tgz"
+        }
+      }
     },
     "pify": {
       "version": "2.3.0",
@@ -3573,8 +3513,8 @@
       "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz"
     },
     "qs": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz"
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz"
     },
     "range-parser": {
       "version": "1.0.3",
@@ -3661,39 +3601,61 @@
       "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"
     },
     "request": {
-      "version": "2.42.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.42.0.tgz",
-      "dependencies": {
-        "bl": {
-          "version": "0.9.5",
-          "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz"
-        },
-        "mime-types": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
-        }
-      }
+      "version": "2.67.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.67.0.tgz"
     },
     "request-progress": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz"
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz"
     },
     "requestretry": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/requestretry/-/requestretry-1.2.2.tgz",
       "dependencies": {
+        "asn1": {
+          "version": "0.1.11",
+          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+        },
+        "assert-plus": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+        },
         "async": {
           "version": "0.9.2",
           "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
         },
+        "aws-sign2": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
+        },
         "bl": {
           "version": "0.9.5",
           "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz"
         },
+        "boom": {
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
+        },
         "caseless": {
           "version": "0.8.0",
           "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"
         },
+        "combined-stream": {
+          "version": "0.0.7",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"
+        },
+        "cryptiles": {
+          "version": "0.2.2",
+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
+        },
+        "delayed-stream": {
+          "version": "0.0.5",
+          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
+        },
+        "forever-agent": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
+        },
         "form-data": {
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
@@ -3704,6 +3666,18 @@
             }
           }
         },
+        "hawk": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz"
+        },
+        "hoek": {
+          "version": "0.9.1",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+        },
+        "http-signature": {
+          "version": "0.10.1",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"
+        },
         "mime-db": {
           "version": "1.12.0",
           "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"
@@ -3723,6 +3697,10 @@
         "request": {
           "version": "2.51.0",
           "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz"
+        },
+        "sntp": {
+          "version": "0.2.4",
+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
         }
       }
     },
@@ -3779,12 +3757,12 @@
       "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-2.0.0.tgz"
     },
     "sass-graph": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.1.0.tgz",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.1.1.tgz",
       "dependencies": {
         "lodash": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.2.0.tgz"
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.2.1.tgz"
         }
       }
     },
@@ -3796,6 +3774,10 @@
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
         },
+        "asn1": {
+          "version": "0.1.11",
+          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+        },
         "assert-plus": {
           "version": "0.1.2",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"
@@ -3804,14 +3786,40 @@
           "version": "0.2.10",
           "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
         },
+        "boom": {
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
+          "dependencies": {
+            "hoek": {
+              "version": "0.9.1",
+              "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+            }
+          }
+        },
         "chalk": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz"
         },
+        "combined-stream": {
+          "version": "0.0.7",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"
+        },
+        "cryptiles": {
+          "version": "0.2.2",
+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
+        },
         "ctype": {
           "version": "0.5.2",
           "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"
         },
+        "delayed-stream": {
+          "version": "0.0.5",
+          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
+        },
+        "forever-agent": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
+        },
         "form-data": {
           "version": "0.0.8",
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.0.8.tgz"
@@ -3852,6 +3860,16 @@
           "version": "2.21.0",
           "resolved": "https://registry.npmjs.org/request/-/request-2.21.0.tgz"
         },
+        "sntp": {
+          "version": "0.2.4",
+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
+          "dependencies": {
+            "hoek": {
+              "version": "0.9.1",
+              "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+            }
+          }
+        },
         "strip-ansi": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz"
@@ -3901,8 +3919,8 @@
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"
     },
     "shelljs": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz"
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.6.0.tgz"
     },
     "sigmund": {
       "version": "1.0.1",
@@ -3925,8 +3943,8 @@
       "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"
     },
     "sntp": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
     },
     "sorted-object": {
       "version": "1.0.0",
@@ -3976,17 +3994,7 @@
     },
     "sshpk": {
       "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.3.tgz",
-      "dependencies": {
-        "asn1": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
-        },
-        "assert-plus": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
-        }
-      }
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.3.tgz"
     },
     "stable": {
       "version": "0.1.5",
@@ -4067,8 +4075,8 @@
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
     },
     "throttleit": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz"
     },
     "through": {
       "version": "2.3.8",
diff --git a/package.json b/package.json
index b144febd1e..0f65326b1a 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "grunt-contrib-connect": "~0.11.2",
     "grunt-contrib-copy": "~0.8.1",
     "grunt-contrib-cssmin": "~0.14.0",
-    "grunt-contrib-qunit": "~0.7.0",
+    "grunt-contrib-qunit": "~1.0.1",
     "grunt-contrib-sass": "^0.9.2",
     "grunt-contrib-uglify": "~0.11.0",
     "grunt-contrib-watch": "~0.6.1",
@@ -51,7 +51,7 @@
     "grunt-exec": "~0.4.6",
     "grunt-html": "~5.0.0",
     "grunt-jekyll": "~0.4.2",
-    "grunt-jscs": "~2.6.0",
+    "grunt-jscs": "~2.7.0",
     "grunt-line-remover": "0.0.2",
     "grunt-postcss": "^0.7.0",
     "grunt-sass": "^1.0.0",
@@ -63,7 +63,7 @@
     "markdown-it": "^5.0.0",
     "mq4-hover-shim": "^0.3.0",
     "npm-shrinkwrap": "^200.1.0",
-    "shelljs": "^0.5.3",
+    "shelljs": "^0.6.0",
     "time-grunt": "^1.2.1"
   },
   "engines": {
diff --git a/scss/.scss-lint.yml b/scss/.scss-lint.yml
index b736c3699d..f739a971a9 100644
--- a/scss/.scss-lint.yml
+++ b/scss/.scss-lint.yml
@@ -1,4 +1,16 @@
-scss_files: "scss/*.scss"
+# Default application configuration that all configurations inherit from.
+scss_files:
+  - "**/*.scss"
+  - "docs/assets/scss/**/*.scss"
+
+plugin_directories: ['.scss-linters']
+
+# List of gem names to load custom linters from (make sure they are already
+# installed)
+plugin_gems: []
+
+# Default severity of all linters.
+severity: warning
 
 linters:
   BangFormat:
@@ -6,8 +18,16 @@ linters:
     space_before_bang: true
     space_after_bang: false
 
+  BemDepth:
+    enabled: false
+    max_elements: 1
+
   BorderZero:
     enabled: true
+    convention: zero # or `none`
+
+  ChainedClasses:
+    enabled: false
 
   ColorKeyword:
     enabled: true
@@ -17,7 +37,10 @@ linters:
 
   Comment:
     enabled: true
-    exclude: ['_normalize.scss', 'bootstrap.scss']
+    exclude:
+      - _normalize.scss
+      - bootstrap.scss
+    style: silent
 
   DebugStatement:
     enabled: true
@@ -25,9 +48,11 @@ linters:
   DeclarationOrder:
     enabled: false
 
+  DisableLinterReason:
+    enabled: false
+
   DuplicateProperty:
     enabled: true
-    exclude: ['mixins/_tab-focus.scss', '_reboot.scss']
 
   ElsePlacement:
     enabled: true
@@ -40,6 +65,9 @@ linters:
   EmptyRule:
     enabled: true
 
+  ExtendDirective:
+    enabled: false
+
   FinalNewline:
     enabled: true
     present: true
@@ -59,7 +87,7 @@ linters:
     enabled: true
 
   ImportantRule:
-    enabled: false
+    enabled: true
 
   ImportPath:
     enabled: true
@@ -68,11 +96,12 @@ linters:
 
   Indentation:
     enabled: true
+    allow_non_nested_indentation: false
     character: space # or 'tab'
     width: 2
 
   LeadingZero:
-    enabled: false
+    enabled: true
     style: exclude_zero # or 'include_zero'
 
   MergeableSelector:
@@ -82,327 +111,350 @@ linters:
   NameFormat:
     enabled: true
     allow_leading_underscore: true
-    convention: hyphenated_lowercase # or 'BEM', or a regex pattern
+    convention: hyphenated_lowercase # or 'camel_case', or 'snake_case', or a regex pattern
 
   NestingDepth:
-    enabled: false
+    enabled: true
+    max_depth: 4
+    ignore_parent_selectors: false
 
   PlaceholderInExtend:
     enabled: false
 
+  PropertyCount:
+    enabled: false
+    include_nested: false
+    max_properties: 10
+
   PropertySortOrder:
     enabled: true
     ignore_unspecified: false
-    severity: warning
-    exclude: ['_normalize.scss']
-    order: [
-      "position",
-      "top",
-      "right",
-      "bottom",
-      "left",
-      "z-index",
-      "-webkit-box-sizing",
-      "-moz-box-sizing",
-      "box-sizing",
-      "display",
-      "float",
-      "width",
-      "min-width",
-      "max-width",
-      "height",
-      "min-height",
-      "max-height",
-      "flex",
-      "flex-direction",
-      "flex-flow",
-      "flex-order",
-      "flex-pack",
-      "flex-align",
-      "padding",
-      "padding-top",
-      "padding-right",
-      "padding-bottom",
-      "padding-left",
-      "margin",
-      "margin-top",
-      "margin-right",
-      "margin-bottom",
-      "margin-left",
-      "overflow",
-      "overflow-x",
-      "overflow-y",
-      "-webkit-overflow-scrolling",
-      "-ms-overflow-x",
-      "-ms-overflow-y",
-      "-ms-overflow-style",
-      "clip",
-      "clear",
-      "font",
-      "font-family",
-      "font-size",
-      "font-style",
-      "font-weight",
-      "font-variant",
-      "font-size-adjust",
-      "font-stretch",
-      "font-effect",
-      "font-emphasize",
-      "font-emphasize-position",
-      "font-emphasize-style",
-      "font-smooth",
-      "-webkit-hyphens",
-      "-moz-hyphens",
-      "hyphens",
-      "line-height",
-      "color",
-      "text-align",
-      "-webkit-text-align-last",
-      "-moz-text-align-last",
-      "-ms-text-align-last",
-      "text-align-last",
-      "text-emphasis",
-      "text-emphasis-color",
-      "text-emphasis-style",
-      "text-emphasis-position",
-      "text-decoration",
-      "text-indent",
-      "text-justify",
-      "text-outline",
-      "-ms-text-overflow",
-      "text-overflow",
-      "text-overflow-ellipsis",
-      "text-overflow-mode",
-      "text-shadow",
-      "text-transform",
-      "text-wrap",
-      "-webkit-text-size-adjust",
-      "-ms-text-size-adjust",
-      "letter-spacing",
-      "-ms-word-break",
-      "word-break",
-      "word-spacing",
-      "-ms-word-wrap",
-      "word-wrap",
-      "-moz-tab-size",
-      "-o-tab-size",
-      "tab-size",
-      "white-space",
-      "vertical-align",
-      "list-style",
-      "list-style-position",
-      "list-style-type",
-      "list-style-image",
-      "pointer-events",
-      "-ms-touch-action",
-      "touch-action",
-      "cursor",
-      "visibility",
-      "zoom",
-      "table-layout",
-      "empty-cells",
-      "caption-side",
-      "border-spacing",
-      "border-collapse",
-      "content",
-      "quotes",
-      "counter-reset",
-      "counter-increment",
-      "resize",
-      "-webkit-user-select",
-      "-moz-user-select",
-      "-ms-user-select",
-      "-o-user-select",
-      "user-select",
-      "nav-index",
-      "nav-up",
-      "nav-right",
-      "nav-down",
-      "nav-left",
-      "background",
-      "background-color",
-      "background-image",
-      "-ms-filter:\\'progid:DXImageTransform.Microsoft.gradient",
-      "filter:progid:DXImageTransform.Microsoft.gradient",
-      "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader",
-      "filter",
-      "background-repeat",
-      "background-attachment",
-      "background-position",
-      "background-position-x",
-      "background-position-y",
-      "-webkit-background-clip",
-      "-moz-background-clip",
-      "background-clip",
-      "background-origin",
-      "-webkit-background-size",
-      "-moz-background-size",
-      "-o-background-size",
-      "background-size",
-      "border",
-      "border-color",
-      "border-style",
-      "border-width",
-      "border-top",
-      "border-top-color",
-      "border-top-style",
-      "border-top-width",
-      "border-right",
-      "border-right-color",
-      "border-right-style",
-      "border-right-width",
-      "border-bottom",
-      "border-bottom-color",
-      "border-bottom-style",
-      "border-bottom-width",
-      "border-left",
-      "border-left-color",
-      "border-left-style",
-      "border-left-width",
-      "border-radius",
-      "border-top-left-radius",
-      "border-top-right-radius",
-      "border-bottom-right-radius",
-      "border-bottom-left-radius",
-      "-webkit-border-image",
-      "-moz-border-image",
-      "-o-border-image",
-      "border-image",
-      "-webkit-border-image-source",
-      "-moz-border-image-source",
-      "-o-border-image-source",
-      "border-image-source",
-      "-webkit-border-image-slice",
-      "-moz-border-image-slice",
-      "-o-border-image-slice",
-      "border-image-slice",
-      "-webkit-border-image-width",
-      "-moz-border-image-width",
-      "-o-border-image-width",
-      "border-image-width",
-      "-webkit-border-image-outset",
-      "-moz-border-image-outset",
-      "-o-border-image-outset",
-      "border-image-outset",
-      "-webkit-border-image-repeat",
-      "-moz-border-image-repeat",
-      "-o-border-image-repeat",
-      "border-image-repeat",
-      "outline",
-      "outline-width",
-      "outline-style",
-      "outline-color",
-      "outline-offset",
-      "-webkit-box-shadow",
-      "-moz-box-shadow",
-      "box-shadow",
-      "filter:progid:DXImageTransform.Microsoft.Alpha(Opacity",
-      "-ms-filter:\\'progid:DXImageTransform.Microsoft.Alpha",
-      "opacity",
-      "-ms-interpolation-mode",
-      "-webkit-transition",
-      "-moz-transition",
-      "-ms-transition",
-      "-o-transition",
-      "transition",
-      "-webkit-transition-delay",
-      "-moz-transition-delay",
-      "-ms-transition-delay",
-      "-o-transition-delay",
-      "transition-delay",
-      "-webkit-transition-timing-function",
-      "-moz-transition-timing-function",
-      "-ms-transition-timing-function",
-      "-o-transition-timing-function",
-      "transition-timing-function",
-      "-webkit-transition-duration",
-      "-moz-transition-duration",
-      "-ms-transition-duration",
-      "-o-transition-duration",
-      "transition-duration",
-      "-webkit-transition-property",
-      "-moz-transition-property",
-      "-ms-transition-property",
-      "-o-transition-property",
-      "transition-property",
-      "-webkit-transform",
-      "-moz-transform",
-      "-ms-transform",
-      "-o-transform",
-      "transform",
-      "-webkit-transform-origin",
-      "-moz-transform-origin",
-      "-ms-transform-origin",
-      "-o-transform-origin",
-      "transform-origin",
-      "-webkit-animation",
-      "-moz-animation",
-      "-ms-animation",
-      "-o-animation",
-      "animation",
-      "-webkit-animation-name",
-      "-moz-animation-name",
-      "-ms-animation-name",
-      "-o-animation-name",
-      "animation-name",
-      "-webkit-animation-duration",
-      "-moz-animation-duration",
-      "-ms-animation-duration",
-      "-o-animation-duration",
-      "animation-duration",
-      "-webkit-animation-play-state",
-      "-moz-animation-play-state",
-      "-ms-animation-play-state",
-      "-o-animation-play-state",
-      "animation-play-state",
-      "-webkit-animation-timing-function",
-      "-moz-animation-timing-function",
-      "-ms-animation-timing-function",
-      "-o-animation-timing-function",
-      "animation-timing-function",
-      "-webkit-animation-delay",
-      "-moz-animation-delay",
-      "-ms-animation-delay",
-      "-o-animation-delay",
-      "animation-delay",
-      "-webkit-animation-iteration-count",
-      "-moz-animation-iteration-count",
-      "-ms-animation-iteration-count",
-      "-o-animation-iteration-count",
-      "animation-iteration-count",
-      "-webkit-animation-direction",
-      "-moz-animation-direction",
-      "-ms-animation-direction",
-      "-o-animation-direction",
-      "animation-direction"
-    ]
+    min_properties: 2
+    separate_groups: false
+    order:
+      - position
+      - top
+      - right
+      - bottom
+      - left
+      - z-index
+      - -webkit-box-sizing
+      - -moz-box-sizing
+      - box-sizing
+      - display
+      - flex
+      - flex-align
+      - flex-basis
+      - flex-direction
+      - flex-flow
+      - flex-grow
+      - flex-order
+      - flex-pack
+      - float
+      - width
+      - min-width
+      - max-width
+      - height
+      - min-height
+      - max-height
+      - padding
+      - padding-top
+      - padding-right
+      - padding-bottom
+      - padding-left
+      - margin
+      - margin-top
+      - margin-right
+      - margin-bottom
+      - margin-left
+      - overflow
+      - overflow-x
+      - overflow-y
+      - -webkit-overflow-scrolling
+      - -ms-overflow-x
+      - -ms-overflow-y
+      - -ms-overflow-style
+      - clip
+      - clear
+      - font
+      - font-family
+      - font-size
+      - font-style
+      - font-weight
+      - font-variant
+      - font-size-adjust
+      - font-stretch
+      - font-effect
+      - font-emphasize
+      - font-emphasize-position
+      - font-emphasize-style
+      - font-smooth
+      - -webkit-hyphens
+      - -moz-hyphens
+      - hyphens
+      - line-height
+      - color
+      - text-align
+      - -webkit-text-align-last
+      - -moz-text-align-last
+      - -ms-text-align-last
+      - text-align-last
+      - text-emphasis
+      - text-emphasis-color
+      - text-emphasis-style
+      - text-emphasis-position
+      - text-decoration
+      - text-indent
+      - text-justify
+      - text-outline
+      - -ms-text-overflow
+      - text-overflow
+      - text-overflow-ellipsis
+      - text-overflow-mode
+      - text-shadow
+      - text-transform
+      - text-wrap
+      - -webkit-text-size-adjust
+      - -ms-text-size-adjust
+      - letter-spacing
+      - -ms-word-break
+      - word-break
+      - word-spacing
+      - -ms-word-wrap
+      - word-wrap
+      - -moz-tab-size
+      - -o-tab-size
+      - tab-size
+      - white-space
+      - vertical-align
+      - list-style
+      - list-style-position
+      - list-style-type
+      - list-style-image
+      - pointer-events
+      - -ms-touch-action
+      - touch-action
+      - cursor
+      - visibility
+      - zoom
+      - table-layout
+      - empty-cells
+      - caption-side
+      - border-spacing
+      - border-collapse
+      - content
+      - quotes
+      - counter-reset
+      - counter-increment
+      - resize
+      - -webkit-user-select
+      - -moz-user-select
+      - -ms-user-select
+      - -o-user-select
+      - user-select
+      - nav-index
+      - nav-up
+      - nav-right
+      - nav-down
+      - nav-left
+      - background
+      - background-color
+      - background-image
+      - -ms-filter:\\'progid:DXImageTransform.Microsoft.gradient
+      - filter:progid:DXImageTransform.Microsoft.gradient
+      - filter:progid:DXImageTransform.Microsoft.AlphaImageLoader
+      - filter
+      - background-repeat
+      - background-attachment
+      - background-position
+      - background-position-x
+      - background-position-y
+      - -webkit-background-clip
+      - -moz-background-clip
+      - background-clip
+      - background-origin
+      - -webkit-background-size
+      - -moz-background-size
+      - -o-background-size
+      - background-size
+      - border
+      - border-color
+      - border-style
+      - border-width
+      - border-top
+      - border-top-color
+      - border-top-style
+      - border-top-width
+      - border-right
+      - border-right-color
+      - border-right-style
+      - border-right-width
+      - border-bottom
+      - border-bottom-color
+      - border-bottom-style
+      - border-bottom-width
+      - border-left
+      - border-left-color
+      - border-left-style
+      - border-left-width
+      - border-radius
+      - border-top-left-radius
+      - border-top-right-radius
+      - border-bottom-right-radius
+      - border-bottom-left-radius
+      - -webkit-border-image
+      - -moz-border-image
+      - -o-border-image
+      - border-image
+      - -webkit-border-image-source
+      - -moz-border-image-source
+      - -o-border-image-source
+      - border-image-source
+      - -webkit-border-image-slice
+      - -moz-border-image-slice
+      - -o-border-image-slice
+      - border-image-slice
+      - -webkit-border-image-width
+      - -moz-border-image-width
+      - -o-border-image-width
+      - border-image-width
+      - -webkit-border-image-outset
+      - -moz-border-image-outset
+      - -o-border-image-outset
+      - border-image-outset
+      - -webkit-border-image-repeat
+      - -moz-border-image-repeat
+      - -o-border-image-repeat
+      - border-image-repeat
+      - outline
+      - outline-width
+      - outline-style
+      - outline-color
+      - outline-offset
+      - -webkit-box-shadow
+      - -moz-box-shadow
+      - box-shadow
+      - filter:progid:DXImageTransform.Microsoft.Alpha(Opacity
+      - -ms-filter:\\'progid:DXImageTransform.Microsoft.Alpha
+      - opacity
+      - -ms-interpolation-mode
+      - -webkit-transition
+      - -moz-transition
+      - -ms-transition
+      - -o-transition
+      - transition
+      - -webkit-transition-delay
+      - -moz-transition-delay
+      - -ms-transition-delay
+      - -o-transition-delay
+      - transition-delay
+      - -webkit-transition-timing-function
+      - -moz-transition-timing-function
+      - -ms-transition-timing-function
+      - -o-transition-timing-function
+      - transition-timing-function
+      - -webkit-transition-duration
+      - -moz-transition-duration
+      - -ms-transition-duration
+      - -o-transition-duration
+      - transition-duration
+      - -webkit-transition-property
+      - -moz-transition-property
+      - -ms-transition-property
+      - -o-transition-property
+      - transition-property
+      - -webkit-transform
+      - -moz-transform
+      - -ms-transform
+      - -o-transform
+      - transform
+      - -webkit-transform-origin
+      - -moz-transform-origin
+      - -ms-transform-origin
+      - -o-transform-origin
+      - transform-origin
+      - -webkit-animation
+      - -moz-animation
+      - -ms-animation
+      - -o-animation
+      - animation
+      - -webkit-animation-name
+      - -moz-animation-name
+      - -ms-animation-name
+      - -o-animation-name
+      - animation-name
+      - -webkit-animation-duration
+      - -moz-animation-duration
+      - -ms-animation-duration
+      - -o-animation-duration
+      - animation-duration
+      - -webkit-animation-play-state
+      - -moz-animation-play-state
+      - -ms-animation-play-state
+      - -o-animation-play-state
+      - animation-play-state
+      - -webkit-animation-timing-function
+      - -moz-animation-timing-function
+      - -ms-animation-timing-function
+      - -o-animation-timing-function
+      - animation-timing-function
+      - -webkit-animation-delay
+      - -moz-animation-delay
+      - -ms-animation-delay
+      - -o-animation-delay
+      - animation-delay
+      - -webkit-animation-iteration-count
+      - -moz-animation-iteration-count
+      - -ms-animation-iteration-count
+      - -o-animation-iteration-count
+      - animation-iteration-count
+      - -webkit-animation-direction
+      - -moz-animation-direction
+      - -ms-animation-direction
+      - -o-animation-direction
+
 
   PropertySpelling:
     enabled: true
     extra_properties: []
+    disabled_properties: []
+
+  PropertyUnits:
+    enabled: true
+    global: [
+      'ch', 'em', 'ex', 'rem',                 # Font-relative lengths
+      'cm', 'in', 'mm', 'pc', 'pt', 'px', 'q', # Absolute lengths
+      'vh', 'vw', 'vmin', 'vmax',              # Viewport-percentage lengths
+      'deg', 'grad', 'rad', 'turn',            # Angle
+      'ms', 's',                               # Duration
+      'Hz', 'kHz',                             # Frequency
+      'dpi', 'dpcm', 'dppx',                   # Resolution
+      '%']                                     # Other
+    properties: {}
 
   PseudoElement:
     enabled: true
 
   QualifyingElement:
-    enabled: false
+    enabled: true
     allow_element_with_attribute: false
     allow_element_with_class: false
     allow_element_with_id: false
 
   SelectorDepth:
-    enabled: false
+    enabled: true
+    max_depth: 4
 
   SelectorFormat:
-    enabled: true
-    convention: hyphenated_lowercase # or 'BEM', or 'snake_case', or 'camel_case', or a regex pattern
-    ignored_types: ["element"]
+    enabled: false
+    convention: hyphenated_lowercase # or 'strict_BEM', or 'hyphenated_BEM', or 'snake_case', or 'camel_case', or a regex pattern
 
   Shorthand:
     enabled: true
+    allowed_shorthands: [1, 2, 3]
 
   SingleLinePerProperty:
-    enabled: true
+    enabled: false
     allow_single_line_rule_sets: true
 
   SingleLinePerSelector:
@@ -410,6 +462,7 @@ linters:
 
   SpaceAfterComma:
     enabled: false
+    style: one_space # or 'no_space', or 'at_least_one_space'
 
   SpaceAfterPropertyColon:
     enabled: true
@@ -418,10 +471,17 @@ linters:
   SpaceAfterPropertyName:
     enabled: true
 
+  SpaceAfterVariableName:
+    enabled: true
+
+  SpaceAroundOperator:
+    enabled: true
+    style: one_space # or 'at_least_one_space', or 'no_space'
+
   SpaceBeforeBrace:
     enabled: true
-    style: space
-    allow_single_line_padding: true
+    style: space # or 'new_line'
+    allow_single_line_padding: false
 
   SpaceBetweenParens:
     enabled: true
@@ -429,14 +489,20 @@ linters:
 
   StringQuotes:
     enabled: true
-    style: double_quotes
+    style: double_quotes # or double_quotes
 
   TrailingSemicolon:
     enabled: true
 
+  TrailingWhitespace:
+    enabled: true
+
   TrailingZero:
     enabled: false
 
+  TransitionAll:
+    enabled: false
+
   UnnecessaryMantissa:
     enabled: true
 
@@ -449,11 +515,17 @@ linters:
   UrlQuotes:
     enabled: true
 
-  VendorPrefixes:
+  VariableForProperty:
+    enabled: false
+    properties: []
+
+  VendorPrefix:
     enabled: true
     identifier_list: base
-    include: []
-    exclude: ['_normalize.scss']
+    additional_identifiers: []
+    excluded_identifiers: []
+    exclude:
+      - _normalize.scss
 
   ZeroUnit:
     enabled: true
diff --git a/scss/_button-group.scss b/scss/_button-group.scss
index 3ef563f998..ff6c33f05f 100644
--- a/scss/_button-group.scss
+++ b/scss/_button-group.scss
@@ -1,3 +1,5 @@
+// scss-lint:disable QualifyingElement
+
 // Make the div behave like a button
 .btn-group,
 .btn-group-vertical {
diff --git a/scss/_buttons.scss b/scss/_buttons.scss
index 1373218eb0..22148bef1c 100644
--- a/scss/_buttons.scss
+++ b/scss/_buttons.scss
@@ -1,3 +1,5 @@
+// scss-lint:disable QualifyingElement
+
 //
 // Base styles
 //
diff --git a/scss/_close.scss b/scss/_close.scss
index 89e68a3817..f98d4c1dc0 100644
--- a/scss/_close.scss
+++ b/scss/_close.scss
@@ -19,6 +19,8 @@
 // iOS requires the button element instead of an anchor tag.
 // If you want the anchor version, it requires `href="#"`.
 // See https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile
+
+// scss-lint:disable QualifyingElement
 button.close {
   padding: 0;
   cursor: pointer;
@@ -26,3 +28,4 @@ button.close {
   border: 0;
   -webkit-appearance: none;
 }
+// scss-lint:enable QualifyingElement
diff --git a/scss/_forms.scss b/scss/_forms.scss
index 28e0f26bdc..fd467030ad 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -1,3 +1,5 @@
+// scss-lint:disable QualifyingElement
+
 //
 // Textual form controls
 //
diff --git a/scss/_input-group.scss b/scss/_input-group.scss
index f99bc3784a..8686069822 100644
--- a/scss/_input-group.scss
+++ b/scss/_input-group.scss
@@ -107,11 +107,13 @@
     @include border-radius($border-radius-lg);
   }
 
+  // scss-lint:disable QualifyingElement
   // Nuke default margins from checkboxes and radios to vertically center within.
   input[type="radio"],
   input[type="checkbox"] {
     margin-top: 0;
   }
+  // scss-lint:enable QualifyingElement
 }
 
 
diff --git a/scss/_labels.scss b/scss/_labels.scss
index c58ddde17e..6dec516085 100644
--- a/scss/_labels.scss
+++ b/scss/_labels.scss
@@ -27,6 +27,7 @@
   top: -1px;
 }
 
+// scss-lint:disable QualifyingElement
 // Add hover effects, but only for links
 a.label {
   @include hover-focus {
@@ -35,6 +36,7 @@ a.label {
     cursor: pointer;
   }
 }
+// scss-lint:enable QualifyingElement
 
 // Pill labels
 //
diff --git a/scss/_list-group.scss b/scss/_list-group.scss
index f00afd1f7a..3d74da4cbc 100644
--- a/scss/_list-group.scss
+++ b/scss/_list-group.scss
@@ -44,6 +44,7 @@
 // Use anchor or button elements instead of `li`s or `div`s to create interactive
 // list items. Includes an extra `.active` modifier class for selected items.
 
+// scss-lint:disable QualifyingElement
 a.list-group-item,
 button.list-group-item {
   width: 100%;
@@ -61,6 +62,7 @@ button.list-group-item {
     background-color: $list-group-hover-bg;
   }
 }
+// scss-lint:enable QualifyingElement
 
 .list-group-item {
   // Disabled state
diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index 5d894364c4..58da40c78b 100644
--- a/scss/_navbar.scss
+++ b/scss/_navbar.scss
@@ -117,6 +117,7 @@
   }
 }
 
+// scss-lint:disable ImportantRule
 // Custom override for
 .navbar-toggleable {
   &-xs {
@@ -135,6 +136,7 @@
     }
   }
 }
+// scss-lint:enable ImportantRule
 
 
 // Navigation
diff --git a/scss/_print.scss b/scss/_print.scss
index 7820888118..ac1c3bba04 100644
--- a/scss/_print.scss
+++ b/scss/_print.scss
@@ -1,3 +1,5 @@
+// scss-lint:disable ImportantRule, QualifyingElement
+
 // Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css
 
 // ==========================================================================
diff --git a/scss/_progress.scss b/scss/_progress.scss
index 8cac202ee0..b2bcb30568 100644
--- a/scss/_progress.scss
+++ b/scss/_progress.scss
@@ -3,8 +3,8 @@
 //
 
 @keyframes progress-bar-stripes {
-  from  { background-position: $spacer-y 0; }
-  to    { background-position: 0 0; }
+  from { background-position: $spacer-y 0; }
+  to { background-position: 0 0; }
 }
 
 
diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index ac3e83baa4..962eb78331 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -1,3 +1,5 @@
+// scss-lint:disable ImportantRule, QualifyingElement, DuplicateProperty
+
 // Reboot
 //
 // Global resets to common HTML elements and more for easier usage by Bootstrap.
diff --git a/scss/_tables.scss b/scss/_tables.scss
index bf688a2c7e..c04e7c9b8a 100644
--- a/scss/_tables.scss
+++ b/scss/_tables.scss
@@ -108,7 +108,7 @@
 .table-responsive {
   display: block;
   width: 100%;
-  min-height: 0.01%; // Workaround for IE9 bug (see https://github.com/twbs/bootstrap/issues/14837)
+  min-height: .01%; // Workaround for IE9 bug (see https://github.com/twbs/bootstrap/issues/14837)
   overflow-x: auto;
 
   // TODO: find out if we need this still.
@@ -171,15 +171,14 @@
   tbody,
   tfoot {
     &:last-child {
-      tr:last-child {
-        th,
-        td {
-          border-bottom: $table-border-width solid $table-border-color;
-        }
+      tr:last-child th,
+      tr:last-child td {
+        border-bottom: $table-border-width solid $table-border-color;
       }
     }
   }
 
+  // scss-lint:disable ImportantRule
   tr {
     float: left;
 
@@ -189,4 +188,5 @@
       border: $table-border-width solid $table-border-color;
     }
   }
+  // scss-lint:enable ImportantRule
 }
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 6650a3bbc6..b891156b28 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -369,7 +369,7 @@ $custom-select-border-color:  $input-border-color !default;
 $custom-select-border-radius: $border-radius !default;
 
 $custom-select-focus-border-color: #51a7e8 !default;
-$custom-select-focus-box-shadow:   inset 0 1px 2px rgba(0, 0, 0, 0.075), 0 0 5px rgba(81, 167, 232, 0.5) !default;
+$custom-select-focus-box-shadow:   inset 0 1px 2px rgba(0, 0, 0, .075), 0 0 5px rgba(81, 167, 232, .5) !default;
 
 $custom-select-sm-padding-y: .2rem !default;
 $custom-select-sm-font-size: 75% !default;
@@ -581,7 +581,7 @@ $popover-arrow-width:                 10px !default;
 $popover-arrow-color:                 $popover-bg !default;
 
 $popover-arrow-outer-width:           ($popover-arrow-width + 1px) !default;
-$popover-arrow-outer-color:           fade-in($popover-border-color, 0.05) !default;
+$popover-arrow-outer-color:           fade-in($popover-border-color, .05) !default;
 
 
 // Labels
diff --git a/scss/utilities/_visibility.scss b/scss/utilities/_visibility.scss
index cdb1428698..63891677e4 100644
--- a/scss/utilities/_visibility.scss
+++ b/scss/utilities/_visibility.scss
@@ -1,3 +1,5 @@
+// scss-lint:disable ImportantRule
+
 //
 // Visibility utilities
 //