Merge branch '3'

This isn't quite finished, but we can work on the issues on master

2 files changed, 4 insertions, 14 deletions

diff --git a/templates/project/manifest.rb b/templates/project/manifest.rb
index e7dfd60..ac4fb83 100644
--- a/templates/project/manifest.rb
+++ b/templates/project/manifest.rb
@@ -8,12 +8,6 @@ stylesheet '_variables.scss'
 # Other Bootstrap assets
 basedir = '../../vendor/assets'
 
-# Glyphicons sprites
-%w(glyphicons-halflings glyphicons-halflings-white).each do |file|
-  image "#{basedir}/images/#{file}.png", :to => "#{file}.png"
-end
-
-# Javascripts
-%w(affix alert button carousel collapse dropdown modal popover scrollspy tab tooltip transition typeahead).each do |file|
-  javascript "#{basedir}/javascripts/bootstrap-#{file}.js", :to => "bootstrap-#{file}.js"
-end
+%w(affix alert button carousel collapse dropdown modal popover scrollspy tab tooltip transition).each do |file|
+  javascript "#{basedir}/javascripts/bootstrap/#{file}.js", :to => "bootstrap/#{file}.js"
+end
\ No newline at end of file
diff --git a/templates/project/styles.scss b/templates/project/styles.scss
index be52cf2..9ae3dd6 100644
--- a/templates/project/styles.scss
+++ b/templates/project/styles.scss
@@ -1,8 +1,4 @@
-// Import all the variables into the main css file.
+// Edit the local variables file to 
 @import "variables";
 
-// I gather this file is a starting point for the project.
 @import "bootstrap";
-
-// Include responsive Bootstrap styles
-// @import "bootstrap-responsive";