diff --git a/Gemfile b/Gemfile
index 059d933a..68f1f5dd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source :gemcutter
 gem "rake", "0.8.7"
 gem "linecache", "0.43"
-gem "rails", "2.3.8"
+gem "rails", "3.2.17"
 gem "pg"
 gem "aws-s3"
 gem 'will_paginate', '~> 2.3.11'
diff --git a/Gemfile.lock b/Gemfile.lock
index 69788163..dd624203 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,17 +18,35 @@ GEM
   remote: http://rubygems.org/
   specs:
     aaronh-chronic (0.3.9)
-    actionmailer (2.3.8)
-      actionpack (= 2.3.8)
-    actionpack (2.3.8)
-      activesupport (= 2.3.8)
-      rack (~> 1.1.0)
-    activerecord (2.3.8)
-      activesupport (= 2.3.8)
-    activeresource (2.3.8)
-      activesupport (= 2.3.8)
-    activesupport (2.3.8)
+    actionmailer (3.2.17)
+      actionpack (= 3.2.17)
+      mail (~> 2.5.4)
+    actionpack (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.17)
+      activesupport (= 3.2.17)
+      builder (~> 3.0.0)
+    activerecord (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
+    activesupport (3.2.17)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
     archive-tar-minitar (0.5.2)
+    arel (3.0.3)
     aws-s3 (0.6.2)
       builder
       mime-types
@@ -40,36 +58,75 @@ GEM
       archive-tar-minitar (~> 0.5.1)
       hoe (>= 1.3.0)
     columnize (0.3.4)
+    concurrent-ruby (1.1.10)
+    erubis (2.7.0)
     factory_girl (1.3.3)
     graticule (0.2.8)
       activesupport
+    hike (1.2.3)
     hoe (2.10.0)
       rake (~> 0.8)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    journey (1.0.4)
+    json (1.8.6)
     libxml-ruby (2.0.9)
     linecache (0.43)
+    mail (2.5.5)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     mime-types (1.16)
+    multi_json (1.15.0)
     newrelic_rpm (3.1.0)
     pdf-writer (1.1.8)
       color (>= 1.4.0)
       transaction-simple (~> 1.3)
     pg (0.11.0)
-    rack (1.1.2)
-    rails (2.3.8)
-      actionmailer (= 2.3.8)
-      actionpack (= 2.3.8)
-      activerecord (= 2.3.8)
-      activeresource (= 2.3.8)
-      activesupport (= 2.3.8)
-      rake (>= 0.8.3)
+    polyglot (0.3.5)
+    rack (1.4.7)
+    rack-cache (1.13.0)
+      rack (>= 0.4)
+    rack-ssl (1.3.4)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (3.2.17)
+      actionmailer (= 3.2.17)
+      actionpack (= 3.2.17)
+      activerecord (= 3.2.17)
+      activeresource (= 3.2.17)
+      activesupport (= 3.2.17)
+      bundler (~> 1.0)
+      railties (= 3.2.17)
+    railties (3.2.17)
+      actionpack (= 3.2.17)
+      activesupport (= 3.2.17)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
     rake (0.8.7)
+    rdoc (3.12.2)
+      json (~> 1.4)
     recaptcha (0.3.4)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
+    sprockets (2.2.3)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (1.2.1)
+    tilt (1.4.1)
     transaction-simple (1.4.0)
       hoe (>= 1.1.7)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.60)
     whenever (0.6.8)
       aaronh-chronic (>= 0.3.9)
       activesupport (>= 2.3.4)
@@ -90,7 +147,7 @@ DEPENDENCIES
   newrelic_rpm
   pdf-writer (= 1.1.8)
   pg
-  rails (= 2.3.8)
+  rails (= 3.2.17)
   rake (= 0.8.7)
   recaptcha (= 0.3.4)
   ruby-debug