diff --git a/.hound.yml b/.hound.yml
index b5810115bccb..3387b0ce0a5b 100644
--- a/.hound.yml
+++ b/.hound.yml
@@ -1,14 +1,12 @@
 fail_on_violations: true
 
 scss:
-  enabled: true
   config_file: scss/.scss-lint.yml
 
-javascript:
+jshint:
   enabled: false
 
 eslint:
-  enabled: true
   config_file: js/.eslintrc.json
   ignore_file: .houndignore
 
diff --git a/.travis.yml b/.travis.yml
index 238a6c0db422..976b6f9fe97c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,9 @@ git:
   depth: 3
 node_js:
   - "4"
-  - "6"
+  - "7"
 before_install:
-  - if [[ `npm -v` != 3* ]]; then npm install -g npm@3; fi
+  - if [[ `npm -v` != 4* ]]; then npm install -g npm@4; fi
   - "export TRAVIS_COMMIT_MSG=\"`git log --format=%B --no-merges -n 1`\""
   - echo "$TRAVIS_COMMIT_MSG" | grep '\[skip validator\]'; export TWBS_DO_VALIDATOR=$?; true
   - echo "$TRAVIS_COMMIT_MSG" | grep '\[skip sauce\]'; export TWBS_DO_SAUCE=$?; true
diff --git a/docs/.htmlhintrc b/docs/.htmlhintrc
index 636af68d7671..dff2e8088c3d 100644
--- a/docs/.htmlhintrc
+++ b/docs/.htmlhintrc
@@ -1,12 +1,14 @@
 {
+  "alt-require": true,
   "attr-lowercase": true,
   "attr-no-duplication": true,
-  "alt-require": true,
   "attr-unsafe-chars": true,
   "attr-value-double-quotes": true,
   "doctype-first": true,
   "doctype-html5": true,
+  "id-class-value": true,
   "id-unique": true,
+  "space-tab-mixed-disabled": true,
   "spec-char-escape": true,
   "src-not-empty": true,
   "tag-pair": true,
diff --git a/js/.eslintrc.json b/js/.eslintrc.json
index 930e1f3c2b2e..07a307a74102 100644
--- a/js/.eslintrc.json
+++ b/js/.eslintrc.json
@@ -13,6 +13,8 @@
   },
   "rules": {
     // Possible Errors
+    "no-await-in-loop": "error",
+    "no-compare-neg-zero": "error",
     "no-extra-parens": "error",
     "no-prototype-builtins": "off",
     "no-template-curly-in-string": "error",
@@ -67,6 +69,7 @@
       }
     ],
     "no-multi-str": "error",
+    "no-new": "error",
     "no-new-func": "off",
     "no-new-wrappers": "error",
     "no-new": "error",
@@ -75,6 +78,7 @@
     "no-proto": "error",
     "no-restricted-properties": "error",
     "no-return-assign": "off",
+    "no-return-await": "error",
     "no-script-url": "error",
     "no-self-compare": "error",
     "no-sequences": "error",
@@ -84,9 +88,11 @@
     "no-useless-call": "error",
     "no-useless-concat": "error",
     "no-useless-escape": "error",
+    "no-useless-return": "off",
     "no-void": "error",
     "no-warning-comments": "off",
     "no-with": "error",
+    "prefer-promise-reject-errors": "error",
     "radix": "error",
     "vars-on-top": "error",
     "wrap-iife": "error",
@@ -100,8 +106,8 @@
     "no-catch-shadow": "error",
     "no-label-var": "error",
     "no-restricted-globals": "error",
-    "no-shadow-restricted-names": "error",
     "no-shadow": "off",
+    "no-shadow-restricted-names": "error",
     "no-undef-init": "error",
     "no-undefined": "off",
     "no-use-before-define": "off",
@@ -122,6 +128,7 @@
     "array-bracket-spacing": "error",
     "block-spacing": "error",
     "brace-style": "error",
+    "capitalized-comments": "off",
     "camelcase": "error",
     "comma-dangle": "error",
     "comma-spacing": "error",
@@ -130,6 +137,7 @@
     "consistent-this": "error",
     "eol-last": "error",
     "func-call-spacing": "error",
+    "func-name-matching": "error",
     "func-names": "off",
     "func-style": ["error", "declaration"],
     "id-blacklist": "error",
@@ -148,8 +156,8 @@
     "max-lines": "off",
     "max-nested-callbacks": "error",
     "max-params": "off",
-    "max-statements-per-line": "error",
     "max-statements": "off",
+    "max-statements-per-line": "error",
     "multiline-ternary": "off",
     "new-cap": ["error", { "capIsNewExceptionPattern": "$.*" }],
     "new-parens": "error",
@@ -162,6 +170,7 @@
     "no-inline-comments": "off",
     "no-lonely-if": "error",
     "no-mixed-operators": "off",
+    "no-multi-assign": "error",
     "no-multiple-empty-lines": "error",
     "no-negated-condition": "off",
     "no-nested-ternary": "error",
@@ -174,19 +183,20 @@
     "no-underscore-dangle": "off",
     "no-unneeded-ternary": "error",
     "no-whitespace-before-property": "error",
+    "nonblock-statement-body-position": "error",
     "object-curly-newline": ["error", { "minProperties": 1 }],
     "object-curly-spacing": ["error", "always"],
     "object-property-newline": "error",
-    "one-var-declaration-per-line": "error",
     "one-var": ["error", "never"],
+    "one-var-declaration-per-line": "error",
     "operator-assignment": "error",
     "operator-linebreak": "off",
     "padded-blocks": "off",
     "quote-props": ["error", "as-needed"],
     "quotes": ["error", "single"],
     "require-jsdoc": "off",
-    "semi-spacing": "error",
     "semi": ["error", "never"],
+    "semi-spacing": "error",
     "sort-keys": "off",
     "sort-vars": "error",
     "space-before-blocks": "error",
@@ -198,6 +208,7 @@
     "space-infix-ops": "error",
     "space-unary-ops": "error",
     "spaced-comment": "error",
+    "template-tag-spacing": "error",
     "unicode-bom": "error",
     "wrap-regex": "off",
 
@@ -217,7 +228,6 @@
     "prefer-arrow-callback": "error",
     "prefer-const": "error",
     "prefer-numeric-literals": "error",
-    "prefer-reflect": "off",
     "prefer-rest-params": "error",
     "prefer-spread": "error",
     "prefer-template": "error",