Migrated to Rails 3.1.3

Gemfile

@@ -1,73 +1,54 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.3'
+gem 'rails', '3.1.3'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 
-gem 'mysql2'
+gem 'mysql2', '>=0.3'
 gem 'haml'
-gem 'hpricot', '>=0.6'
-gem 'RedCloth', '>=4.2.3', :require => 'redcloth'
-gem 'will_paginate', '~> 3.0.0'
-gem 'sitemap_generator'
-gem 'compass'
+gem 'sass-rails',   '~> 3.1.4'
+gem 'compass', '~> 0.12.alpha.0'
 gem 'html5-boilerplate'
+gem 'will_paginate', '~> 3.0.0'
 gem 'bcrypt-ruby', :require => 'bcrypt'
-gem 'inherited_resources', '~> 1.2.1'
+gem 'inherited_resources'
 gem 'paperclip'
 gem 'honeypot-captcha'
 
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'uglifier', '>= 1.0.3'
+  gem 'coffee-rails', '~> 3.1.1'
+  gem 'therubyracer'
+end
+
+# JavasScript libs
+gem 'jquery-rails'
+gem 'modernizr-rails'
+
 group :development do
   gem 'annotate'
   gem 'mongrel'
   gem 'haml-rails' # haml generators
   gem 'ruby-debug'
-  gem 'wirble'
-  gem 'interactive_editor'
-  gem 'sketches'
-  gem 'awesome_print'
+  gem 'mongrel'
 end
 
 group :development, :test do
-  gem 'rspec-rails'
+  gem 'rspec-rails', '>= 2.8.0'
   gem 'web-app-theme', '>= 0.6.2'
   gem 'ruby_parser' # used by web-app-theme
 end
 
 group :test do
-  gem 'rspec'
-  gem 'cucumber'
-  gem 'cucumber-rails'
+  gem 'cucumber-rails', :require => false
   gem 'database_cleaner'
   gem 'capybara'
   gem 'pickle'
-  gem 'spork'
   gem 'factory_girl_rails'
-  gem 'shoulda'
+  gem 'shoulda-matchers'
   gem 'email_spec'
   gem 'launchy'
 end
-
-# Use unicorn as the web server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
-# gem 'ruby-debug'
-# gem 'ruby-debug19'
-
-# Bundle the extra gems:
-# gem 'bj'
-# gem 'nokogiri'
-# gem 'sqlite3-ruby', :require => 'sqlite3'
-# gem 'aws-s3', :require => 'aws/s3'
-
-# Bundle gems for the local environment. Make sure to
-# put test-only gems in this group so their generators
-# and rake tasks are available in development mode:
-# group :development, :test do
-#   gem 'webrat'
-# end