Merge branch 'v4-dev' into v4-docs-streamlined

diff --cc Gemfile.lock
Simple merge

diff --cc package.json
index 8816c1bd11dc7c728b2c5c2a6dfb15b0f25743db,8fb8c824613309689b4499839286a1fd37abe52a..e44d3018658f17c65a74bd69a9475f81ee8161c8
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -73,15 -74,16 +73,15 @@@
      "popper.js": "^1.9.9"
    },
    "devDependencies": {
-     "autoprefixer": "^6.7.7",
+     "autoprefixer": "^7.1.1",
      "babel-cli": "^6.24.1",
-     "babel-eslint": "^7.2.2",
+     "babel-eslint": "^7.2.3",
      "babel-plugin-transform-es2015-modules-strip": "^0.1.1",
      "babel-preset-es2015": "^7.0.0-alpha.7",
-     "clean-css-cli": "^4.0.12",
+     "clean-css-cli": "^4.1.3",
      "eslint": "^3.19.0",
 -    "htmlhint": "^0.9.13",
      "htmllint-cli": "^0.0.6",
-     "node-sass": "^4.5.2",
+     "node-sass": "^4.5.3",
      "nodemon": "^1.11.0",
      "npm-run-all": "^4.0.2",
      "phantomjs-prebuilt": "^2.1.14",