Merge commit '12c0d9e0900b167ab38b245083ca02644ad7823b' into npm-fix

# Conflicts:
#	.gitignore
#	bower.json
#	package.json

Author: Daniel Smith

bower.json

@@ -33,7 +33,7 @@
     "README.md"
   ],
   "dependencies": {
-    "bootstrap": "^3.x",
+    "bootstrap": "~3.3.5",
     "angular": "^1.5",
     "angular-sanitize": "^1.5",
     "angular-bootstrap": "^1.1.2",

package.json

@@ -22,16 +22,16 @@
   "main": "index.js",
   "devDependencies": {
     "gulp": "^3.9.0",
-    "gulp-bump": "^0.3.1",
-    "gulp-concat": "^2.4.1",
+    "gulp-bump": "^1.0.0",
+    "gulp-concat": "^2.6.0",
     "gulp-connect": "^2.2.0",
-    "gulp-header": "^1.2.2",
-    "gulp-jshint": "^1.8.4",
-    "gulp-minify": "0.0.3",
-    "gulp-minify-css": "^0.3.10",
-    "gulp-rename": "^1.2.0",
-    "gulp-util": "^3.0.5",
-    "gulp-wrap": "^0.3.0",
+    "gulp-header": "^1.7.1",
+    "gulp-jshint": "^1.11.2",
+    "gulp-minify": "0.0.5",
+    "gulp-minify-css": "^1.2.1",
+    "gulp-rename": "^1.2.2",
+    "gulp-util": "^3.0.6",
+    "gulp-wrap": "^0.11.0"
     "jasmine-core": "^2.3.4",
     "karma": "^0.13.10",
     "karma-jasmine": "^0.3.6",