Merge branch 'master' into agj/rebuild-assets-0.3

Author: agjohnson

.gitignore

@@ -10,5 +10,6 @@
 .ruby-version
 dist/
 bower_components/
-node_modules/
+node_modules
 npm-debug.log
+package-lock.json

package.json

@@ -2,8 +2,8 @@
   "name": "sphinx_rtd_theme",
   "version": "0.2.5b2",
   "private": true,
-  "dependencies": {},
   "devDependencies": {
+    "bower": "^1.8.4",
     "browserify": "^13.0.0",
     "connect-livereload": "~0.6.0",
     "grunt": "~1.0.1",