Updates to work with newest compass-h5bp

lib/generators/html5/assets/templates/stylesheets/application.css.scss

@@ -17,6 +17,7 @@
 // Prepend includes
 //-----------------------------------------
 @include h5bp-normalize;
+@include h5bp-main;
 
 //-----------------------------------------
 // Custom <%= file_path %> partials

lib/generators/html5/assets/templates/stylesheets/application/chromeframe.css.scss

@@ -3,7 +3,7 @@
 // Upgrade with: $ rails generate html5:install
 
 //-----------------------------------------
-// Chrome Frame prompt
+// Chrome Frame override
 //-----------------------------------------
 
 .chromeframe {

lib/generators/html5/install/templates/config/compass.rb

@@ -1,25 +1,4 @@
-# This configuration file works with both the Compass command line tool and within Rails.
-require 'compass/h5bp'
-
 # Require any additional compass plugins here.
+require 'compass/h5bp'
 
-project_type = :rails
-
-# Set this to the root of your project when deployed:
-http_path = "/"
-
-# You can select your preferred output style here (can be overridden via the command line):
-# output_style = :expanded or :nested or :compact or :compressed
-
-# To enable relative paths to assets via compass helper functions. Uncomment:
-# relative_assets = true
-
-# To disable debugging comments that display the original location of your selectors. Uncomment:
-# line_comments = false
-
-
-# If you prefer the indented syntax, you might want to regenerate this
-# project again passing --syntax sass, or you can uncomment this:
-# preferred_syntax = :sass
-# and then run:
-# sass-convert -R --from scss --to sass app/stylesheets scss && rm -rf sass && mv scss sass
+project_type = :rails