Remove .erb extension for compatibility with Rails 3 version of sass-rails gem
Merge branch 'sass-rails-compat'