Merge branch 'master' into cssbuild-shady-root-rule-fix

Author: dfreedm

.travis.yml

@@ -12,17 +12,16 @@ addons:
     - google-chrome-stable
 cache:
   directories:
-    - node_modules
+  - node_modules
 before_script:
 - npm install -g bower gulp-cli@1
 - bower install
 - gulp lint
 - gulp switch
 script:
 - xvfb-run wct
-- "if [ \"${TRAVIS_PULL_REQUEST}\" = \"false\" ]; then wct -s default; fi"
-
+- if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then wct -s default; fi
 env:
   global:
-  - secure: eFrp9xwSYG579rAR9/XyXYKh+UtIQJ1xS5q5PABu4ndYFckdJb8o3m7oXqRSikbiPWbCSd3Fkd6+ZKXlcQFdjJ+nx9gFitGthtH93qkvZCO3XhWEEBPj65igIo3hrRSOB6dIWyiZcnoH9IXLLQtKXY9uL1NCqCcyVHg1omPKr9w=
-  - secure: EAjjkzqZ8z+PEvdo2N2MiIjkqUYAjVkQABKyMw6N4hUa6YSNEW9PYyn4I0d9Rdvc25GwJ+oLQFdeQepioAkNfp6wYUj2IdMIfmmKa1aJWo5DWvOMDYp3ufRhIoiVi4ZVpLg9sTjw+078UhUQFWE44rwfUtHiIb2UbWe2/ueLOiM=
+  - secure: JXQACDLgoprzbPeo7MW+7rwwUFvee6b+sWsTICnujLeTJyqtOLYK5DBKr+dtejd35QNaEANBFg4BXieujrvh2zkq/jguhgWFbUB3p+ZitC8WVsHHSTHP3C7vm4mNNE3/5EnO/FozWeVT65dWc4NFZQ0SAKMZkfs3HDqp0JX4Dvg=
+  - secure: vqpcGG4E9MWVLimtTBc5iUzoKMVWPnPocxkAw0nY0tmPNeYIeU7V9j77qnwuL+XShIy+2D+VnZRndPOZHp+5GmqzRiXel8B7r4vKK3kyKnhNoGcZ+kDIuXdH3iUvoL12S0+MGcy5L7v8XsorYIuy0Vp2PvInjJM6DODNWrgLOLQ=