Changing the way Bootstrap Sass package is ref'd

Aliasing "bootstrap-sass" to the github URL
git://github.com/twbs/bootstrap-sass.git is probably not a good idea.
This could create confusion with the bootstrap-sass package in
the official repository which actually points to
git://github.com/jlong/sass-twitter-bootstrap.git and only goes up to
version 3.0.2 currently. This is NOT the official package.

Changed references to "bootstrap-sass-official" to avoid any
potential confusion.

app/index.js

@@ -122,7 +122,7 @@ AppGenerator.prototype.writeIndex = function writeIndex() {
 
   // wire Bootstrap plugins
   if (this.includeBootstrap) {
-    var bs = 'bower_components/bootstrap' + (this.includeCompass ? '-sass/vendor/assets/javascripts/bootstrap/' : '/js/');
+    var bs = 'bower_components/bootstrap' + (this.includeCompass ? '-sass-official/vendor/assets/javascripts/bootstrap/' : '/js/');
     this.indexFile = this.appendScripts(this.indexFile, 'scripts/plugins.js', [
       bs + 'affix.js',
       bs + 'alert.js',

app/templates/Gruntfile.js

@@ -355,7 +355,7 @@ module.exports = function (grunt) {
                         'images/{,*/}*.webp',
                         '{,*/}*.html',
                         'styles/fonts/{,*/}*.*'<% if (includeBootstrap) { %>,<% if (includeCompass) { %>
-                        'bower_components/bootstrap-sass/vendor/assets/fonts/bootstrap/*.*'<% } else { %>
+                        'bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/*.*'<% } else { %>
                         'bower_components/bootstrap/dist/fonts/*.*'<% } %><% } %>
                     ]
                 }]

app/templates/_bower.json

@@ -2,7 +2,7 @@
   "name": "<%= _.slugify(appname) %>",
   "private": true,
   "dependencies": {<% if (includeBootstrap) { if (includeCompass) { %>
-    "bootstrap-sass": "twbs/bootstrap-sass#v3.1.0",<% } else { %>
+    "bootstrap-sass-official": "~3.1.0",<% } else { %>
     "bootstrap": "~3.0.3",<% }} if (includeModernizr) { %>
     "modernizr": "~2.6.2",<% } %>
     "jquery": "~1.11.0"

app/templates/main.scss

@@ -1,7 +1,7 @@
-<% if (includeBootstrap) { %>$icon-font-path: "/bower_components/bootstrap-sass/vendor/assets/fonts/bootstrap/";
+<% if (includeBootstrap) { %>$icon-font-path: "/bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/";
 
 // bower:scss
-@import 'bootstrap-sass/vendor/assets/stylesheets/bootstrap.scss';
+@import 'bootstrap-sass-official/vendor/assets/stylesheets/bootstrap.scss';
 // endbower
 
 .browsehappy {