diff --git a/Gemfile b/Gemfile
index d4ebd4c..47274d0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'rake'
 
-gem 'rails', '3.1.3'
+gem 'rails', '3.2.8'
 gem 'jquery-rails', '1.0.12'
 
 # templating
@@ -30,14 +30,11 @@ gem 'oa-openid', :require => 'omniauth/openid'
 
 # for file upload ( -> avatar )
 gem 'paperclip',  '~> 2.3'
-gem 'jammit', '~> 0.6.5' #, :git => 'git://github.com/documentcloud/jammit.git'
 
 group :assets do
-  gem 'sass-rails',   '~> 3.1.5'
-  gem 'coffee-rails', '~> 3.1.1'
+  gem 'sass-rails',   '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
   gem 'uglifier',     '>= 1.0.3'
-  gem 'closure'
-  gem 'win32-open3-19' # win32-open3 in order to use POpen4 on Win32 (dependency of jammit)
 end
 
 group :development, :test do
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 7f1717d..22da9b6 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -5,8 +5,6 @@
     = javascript_include_tag "http://www.google.com/jsapi"
     = stylesheet_link_tag "application", :media=>'all'
     = javascript_include_tag "application"
-    -# = include_stylesheets :common, :media=>'all'
-    -# = include_javascripts :jquery, :helper, :plugins, :common
     :javascript
       google.load("swfobject", "2.1");
       google.setOnLoadCallback(_run);
diff --git a/config/application.rb b/config/application.rb
index d7385d5..b0203b3 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -12,7 +12,6 @@ module Nineminutes
     config.action_controller.page_cache_directory = Rails.root.to_s+"/public/cache/"
 
     # asset packaging
-    config.gem "jammit"
     config.serve_static_assets = true
 
     config.encoding = "utf-8"
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 17ea73a..14146e8 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -31,5 +31,12 @@ Nineminutes::Application.configure do
 
   # Expands the lines which load the assets
   config.assets.debug = true
+
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
+
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  config.active_record.auto_explain_threshold_in_seconds = 0.5
 end
 
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 6413791..b5d2f12 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -36,4 +36,7 @@ Nineminutes::Application.configure do
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
+
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
 end