diff --git a/Gemfile b/Gemfile
index af226dc..4e7f335 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,11 +1,11 @@
 source 'http://rubygems.org'
 
-gem 'rails', '~>3.0.19'
+gem 'rails', '~>3.1.0'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 
-gem 'pg', '0.10.0'
+gem 'pg', '~>0.11.0'
 gem 'nokogiri', '1.4.4'
 gem 'haml-rails', '0.3.4'
 gem 'will_paginate'
diff --git a/Gemfile.lock b/Gemfile.lock
index d5cfaf7..a817589 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,40 +2,40 @@ GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.3)
-    abstract (1.0.0)
-    actionmailer (3.0.20)
-      actionpack (= 3.0.20)
-      mail (~> 2.2.19)
-    actionpack (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.5)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.20)
-      activesupport (= 3.0.20)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-    activesupport (3.0.20)
-    arel (2.0.10)
-    builder (2.1.2)
+    actionmailer (3.1.11)
+      actionpack (= 3.1.11)
+      mail (~> 2.3.3)
+    actionpack (3.1.11)
+      activemodel (= 3.1.11)
+      activesupport (= 3.1.11)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.6)
+      rack-cache (~> 1.2)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.4)
+    activemodel (3.1.11)
+      activesupport (= 3.1.11)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.11)
+      activemodel (= 3.1.11)
+      activesupport (= 3.1.11)
+      arel (~> 2.2.3)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.11)
+      activemodel (= 3.1.11)
+      activesupport (= 3.1.11)
+    activesupport (3.1.11)
+      multi_json (~> 1.0)
+    arel (2.2.3)
+    builder (3.0.4)
     coderay (0.9.7)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    haml (3.0.25)
+    diff-lcs (1.2.1)
+    erubis (2.7.0)
+    haml (3.1.8)
     haml-rails (0.3.4)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
@@ -43,59 +43,68 @@ GEM
       railties (~> 3.0)
     highlight (1.1.3)
       activesupport (>= 2.0.0)
-    i18n (0.5.0)
+    hike (1.2.1)
+    i18n (0.6.4)
     json (1.7.7)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+    mail (2.3.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.21)
+    multi_json (1.6.1)
     nokogiri (1.4.4)
-    pg (0.10.0)
+    pg (0.11.0)
     pg_search (0.2)
     polyglot (0.3.3)
-    rack (1.2.8)
-    rack-mount (0.6.14)
+    rack (1.3.10)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.0.20)
-      actionmailer (= 3.0.20)
-      actionpack (= 3.0.20)
-      activerecord (= 3.0.20)
-      activeresource (= 3.0.20)
-      activesupport (= 3.0.20)
+    rails (3.1.11)
+      actionmailer (= 3.1.11)
+      actionpack (= 3.1.11)
+      activerecord (= 3.1.11)
+      activeresource (= 3.1.11)
+      activesupport (= 3.1.11)
       bundler (~> 1.0)
-      railties (= 3.0.20)
-    railties (3.0.20)
-      actionpack (= 3.0.20)
-      activesupport (= 3.0.20)
+      railties (= 3.1.11)
+    railties (3.1.11)
+      actionpack (= 3.1.11)
+      activesupport (= 3.1.11)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.4)
+      thor (~> 0.14.6)
     rake (10.0.3)
     rdoc (3.12.2)
       json (~> 1.4)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
-    rspec-rails (2.4.1)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.4.0)
+    rspec-core (2.13.0)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+    rspec-rails (2.13.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    sprockets (2.0.4)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
     thor (0.14.6)
+    tilt (1.3.5)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.36)
-    will_paginate (2.3.15)
+    will_paginate (3.0.4)
 
 PLATFORMS
   ruby
@@ -106,8 +115,8 @@ DEPENDENCIES
   haml-rails (= 0.3.4)
   highlight (~> 1.1.3)
   nokogiri (= 1.4.4)
-  pg (= 0.10.0)
+  pg (~> 0.11.0)
   pg_search (= 0.2)
-  rails (~> 3.0.19)
+  rails (~> 3.1.0)
   rspec-rails
   will_paginate
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 814f50d..65a380e 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -1,3 +1,5 @@
+require 'will_paginate/array'
+
 class SearchController < ApplicationController
   PER_PAGE = 30
 
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 81c59d2..203d3cc 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -11,7 +11,7 @@
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
+  #config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send