diff --git a/Gemfile.lock b/Gemfile.lock
index 127611ee..48af763b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,7 +3,7 @@ PATH
   specs:
     shoulda-matchers (1.5.0)
       activesupport (>= 3.0.0)
-      bourne (~> 1.2.0)
+      bourne (~> 1.3)
 
 GEM
   remote: https://rubygems.org/
@@ -43,8 +43,8 @@ GEM
       childprocess (~> 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    bourne (1.2.1)
-      mocha (= 0.12.7)
+    bourne (1.4.0)
+      mocha (~> 0.13.2)
     builder (3.0.4)
     childprocess (0.3.6)
       ffi (~> 1.0, >= 1.0.6)
@@ -53,29 +53,29 @@ GEM
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.11.0)
       json (>= 1.4.6)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.1)
     erubis (2.7.0)
     ffi (1.2.0)
     gherkin (2.11.5)
       json (>= 1.4.6)
     hike (1.2.1)
-    i18n (0.6.1)
+    i18n (0.6.4)
     journey (1.0.4)
-    json (1.7.6)
+    json (1.7.7)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
     mime-types (1.19)
-    mocha (0.12.7)
+    mocha (0.13.3)
       metaclass (~> 0.0.1)
-    multi_json (1.5.0)
+    multi_json (1.7.1)
     polyglot (0.3.3)
-    rack (1.4.4)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -95,21 +95,23 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.0.3)
-    rdoc (3.12)
+    rdoc (3.12.2)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    rspec-rails (2.8.1)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    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 (~> 2.8.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
     shoulda-context (1.0.1)
     sprockets (2.2.2)
       hike (~> 1.2)
@@ -121,8 +123,8 @@ GEM
       actionpack (~> 3.1)
       activemodel (~> 3.1)
       railties (~> 3.1)
-    thor (0.16.0)
-    tilt (1.3.3)
+    thor (0.17.0)
+    tilt (1.3.6)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
@@ -142,7 +144,8 @@ DEPENDENCIES
   jruby-openssl
   rails (~> 3.0)
   rake (>= 0.9.2)
-  rspec-rails (~> 2.8.1)
+  rspec (~> 2.13)
+  rspec-rails (~> 2.13)
   shoulda-context (~> 1.0.0)
   shoulda-matchers!
   sqlite3
diff --git a/features/step_definitions/rails_steps.rb b/features/step_definitions/rails_steps.rb
index 8c9f9a5d..4eb5dd1d 100644
--- a/features/step_definitions/rails_steps.rb
+++ b/features/step_definitions/rails_steps.rb
@@ -25,8 +25,9 @@ When 'I generate a new rails application' do
     And I set the "BUNDLE_GEMFILE" environment variable to "Gemfile"
     And I successfully run `bundle install --local`
   }
+
   if RUBY_VERSION >= '1.9.3'
-    append_to_gemfile %(gem 'rake', '~> 0.9.3.beta.1')
+    append_to_gemfile %(gem 'rake', '~> 0.9')
     step %(I successfully run `bundle update rake`)
   end
 end
@@ -52,21 +53,21 @@ When 'I run the rspec generator' do
 end
 
 When 'I configure the application to use rspec-rails' do
-  append_to_gemfile %q(gem 'rspec-rails', '~> 2.8.1')
+  append_to_gemfile %q(gem 'rspec-rails', '~> 2.13')
   steps %{And I run `bundle install --local`}
 end
 
 When 'I configure the application to use rspec-rails in test and development' do
   append_to_gemfile <<-GEMFILE
   group :test, :development do
-    gem 'rspec-rails', '~> 2.8.1'
+    gem 'rspec-rails', '~> 2.13'
   end
   GEMFILE
   steps %{And I run `bundle install --local`}
 end
 
 When 'I configure the application to use shoulda-context' do
-  append_to_gemfile %q(gem 'shoulda-context', '~> 1.0.0')
+  append_to_gemfile %q(gem 'shoulda-context', '~> 1.0')
   steps %{And I run `bundle install --local`}
 end
 
diff --git a/gemfiles/3.0.gemfile b/gemfiles/3.0.gemfile
index 1a9ad22b..2dfd8356 100644
--- a/gemfiles/3.0.gemfile
+++ b/gemfiles/3.0.gemfile
@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gem "shoulda-context", "~> 1.0.0"
 gem "sqlite3", :platform=>:ruby
diff --git a/gemfiles/3.0.gemfile.lock b/gemfiles/3.0.gemfile.lock
index 8efefa32..d81af890 100644
--- a/gemfiles/3.0.gemfile.lock
+++ b/gemfiles/3.0.gemfile.lock
@@ -1,20 +1,20 @@
 PATH
-  remote: /Users/draper/Dropbox/Development/shoulda-matchers
+  remote: /Users/croaky/dev/shoulda-matchers
   specs:
     shoulda-matchers (1.5.0)
       activesupport (>= 3.0.0)
-      bourne (~> 1.2.0)
+      bourne (~> 1.3)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.17)
-      actionpack (= 3.0.17)
+    actionmailer (3.0.20)
+      actionpack (= 3.0.20)
       mail (~> 2.2.19)
-    actionpack (3.0.17)
-      activemodel (= 3.0.17)
-      activesupport (= 3.0.17)
+    actionpack (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
@@ -22,19 +22,19 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.17)
-      activesupport (= 3.0.17)
+    activemodel (3.0.20)
+      activesupport (= 3.0.20)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.17)
-      activemodel (= 3.0.17)
-      activesupport (= 3.0.17)
+    activerecord (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.17)
-      activemodel (= 3.0.17)
-      activesupport (= 3.0.17)
-    activesupport (3.0.17)
+    activeresource (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+    activesupport (3.0.20)
     appraisal (0.5.1)
       bundler
       rake
@@ -43,72 +43,75 @@ GEM
       childprocess (~> 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    bourne (1.2.1)
-      mocha (= 0.12.7)
+    bourne (1.4.0)
+      mocha (~> 0.13.2)
     builder (2.1.2)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
-    cucumber (1.2.1)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    cucumber (1.2.3)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
-    diff-lcs (1.1.3)
+      gherkin (~> 2.11.6)
+      multi_json (~> 1.3)
+    diff-lcs (1.2.1)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    ffi (1.3.1)
-    gherkin (2.11.5)
-      json (>= 1.4.6)
+    ffi (1.4.0)
+    gherkin (2.11.6)
+      json (>= 1.7.6)
     i18n (0.5.0)
-    json (1.7.6)
+    json (1.7.7)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.19)
-    mocha (0.12.7)
+    mime-types (1.21)
+    mocha (0.13.3)
       metaclass (~> 0.0.1)
+    multi_json (1.7.1)
     polyglot (0.3.3)
-    rack (1.2.7)
+    rack (1.2.8)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.17)
-      actionmailer (= 3.0.17)
-      actionpack (= 3.0.17)
-      activerecord (= 3.0.17)
-      activeresource (= 3.0.17)
-      activesupport (= 3.0.17)
+    rails (3.0.20)
+      actionmailer (= 3.0.20)
+      actionpack (= 3.0.20)
+      activerecord (= 3.0.20)
+      activeresource (= 3.0.20)
+      activesupport (= 3.0.20)
       bundler (~> 1.0)
-      railties (= 3.0.17)
-    railties (3.0.17)
-      actionpack (= 3.0.17)
-      activesupport (= 3.0.17)
+      railties (= 3.0.20)
+    railties (3.0.20)
+      actionpack (= 3.0.20)
+      activesupport (= 3.0.20)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
     rake (10.0.3)
-    rdoc (3.12)
+    rdoc (3.12.2)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    rspec-rails (2.8.1)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    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 (~> 2.8.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
     shoulda-context (1.0.2)
     sqlite3 (1.3.7)
-    strong_parameters (0.1.6)
+    strong_parameters (0.2.0)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
       railties (~> 3.0)
@@ -116,7 +119,7 @@ GEM
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
@@ -132,7 +135,8 @@ DEPENDENCIES
   jruby-openssl
   rails (~> 3.0.17)
   rake (>= 0.9.2)
-  rspec-rails (~> 2.8.1)
+  rspec (~> 2.13)
+  rspec-rails (~> 2.13)
   shoulda-context (~> 1.0.0)
   shoulda-matchers!
   sqlite3
diff --git a/gemfiles/3.1.gemfile b/gemfiles/3.1.gemfile
index 741fb425..bb7d8c02 100644
--- a/gemfiles/3.1.gemfile
+++ b/gemfiles/3.1.gemfile
@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gem "shoulda-context", "~> 1.0.0"
 gem "sqlite3", :platform=>:ruby
diff --git a/gemfiles/3.1.gemfile.lock b/gemfiles/3.1.gemfile.lock
index 316add8b..9faf3a8c 100644
--- a/gemfiles/3.1.gemfile.lock
+++ b/gemfiles/3.1.gemfile.lock
@@ -1,19 +1,19 @@
 PATH
-  remote: /Users/draper/Dropbox/Development/shoulda-matchers
+  remote: /Users/croaky/dev/shoulda-matchers
   specs:
     shoulda-matchers (1.5.0)
       activesupport (>= 3.0.0)
-      bourne (~> 1.2.0)
+      bourne (~> 1.3)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actionmailer (3.1.8)
-      actionpack (= 3.1.8)
+    actionmailer (3.1.11)
+      actionpack (= 3.1.11)
       mail (~> 2.3.3)
-    actionpack (3.1.8)
-      activemodel (= 3.1.8)
-      activesupport (= 3.1.8)
+    actionpack (3.1.11)
+      activemodel (= 3.1.11)
+      activesupport (= 3.1.11)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
@@ -22,20 +22,20 @@ GEM
       rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.0.4)
-    activemodel (3.1.8)
-      activesupport (= 3.1.8)
+    activemodel (3.1.11)
+      activesupport (= 3.1.11)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.8)
-      activemodel (= 3.1.8)
-      activesupport (= 3.1.8)
+    activerecord (3.1.11)
+      activemodel (= 3.1.11)
+      activesupport (= 3.1.11)
       arel (~> 2.2.3)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.8)
-      activemodel (= 3.1.8)
-      activesupport (= 3.1.8)
-    activesupport (3.1.8)
-      multi_json (>= 1.0, < 1.3)
+    activeresource (3.1.11)
+      activemodel (= 3.1.11)
+      activesupport (= 3.1.11)
+    activesupport (3.1.11)
+      multi_json (~> 1.0)
     appraisal (0.5.1)
       bundler
       rake
@@ -44,78 +44,80 @@ GEM
       childprocess (~> 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    bourne (1.2.1)
-      mocha (= 0.12.7)
+    bourne (1.4.0)
+      mocha (~> 0.13.2)
     builder (3.0.4)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
-    cucumber (1.2.1)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    cucumber (1.2.3)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
-    diff-lcs (1.1.3)
+      gherkin (~> 2.11.6)
+      multi_json (~> 1.3)
+    diff-lcs (1.2.1)
     erubis (2.7.0)
-    ffi (1.3.1)
-    gherkin (2.11.5)
-      json (>= 1.4.6)
+    ffi (1.4.0)
+    gherkin (2.11.6)
+      json (>= 1.7.6)
     hike (1.2.1)
-    i18n (0.6.1)
-    jquery-rails (2.2.0)
+    i18n (0.6.4)
+    jquery-rails (2.2.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.7.6)
+    json (1.7.7)
     mail (2.3.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.19)
-    mocha (0.12.7)
+    mime-types (1.21)
+    mocha (0.13.3)
       metaclass (~> 0.0.1)
-    multi_json (1.2.0)
+    multi_json (1.7.1)
     polyglot (0.3.3)
-    rack (1.3.9)
+    rack (1.3.10)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.1.8)
-      actionmailer (= 3.1.8)
-      actionpack (= 3.1.8)
-      activerecord (= 3.1.8)
-      activeresource (= 3.1.8)
-      activesupport (= 3.1.8)
+    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.1.8)
-    railties (3.1.8)
-      actionpack (= 3.1.8)
-      activesupport (= 3.1.8)
+      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.6)
     rake (10.0.3)
-    rdoc (3.12)
+    rdoc (3.12.2)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    rspec-rails (2.8.1)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    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 (~> 2.8.0)
-    sass (3.2.5)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    sass (3.2.7)
     sass-rails (3.1.6)
       actionpack (~> 3.1.0)
       railties (~> 3.1.0)
@@ -127,16 +129,16 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.7)
-    strong_parameters (0.1.6)
+    strong_parameters (0.2.0)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
       railties (~> 3.0)
     thor (0.14.6)
-    tilt (1.3.3)
+    tilt (1.3.6)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
@@ -153,7 +155,8 @@ DEPENDENCIES
   jruby-openssl
   rails (~> 3.1.8)
   rake (>= 0.9.2)
-  rspec-rails (~> 2.8.1)
+  rspec (~> 2.13)
+  rspec-rails (~> 2.13)
   sass-rails
   shoulda-context (~> 1.0.0)
   shoulda-matchers!
diff --git a/gemfiles/3.2.gemfile b/gemfiles/3.2.gemfile
index 9b2afff6..4fe3a1c8 100644
--- a/gemfiles/3.2.gemfile
+++ b/gemfiles/3.2.gemfile
@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gem "shoulda-context", "~> 1.0.0"
 gem "sqlite3", :platform=>:ruby
diff --git a/gemfiles/3.2.gemfile.lock b/gemfiles/3.2.gemfile.lock
index bc53fd8a..77190645 100644
--- a/gemfiles/3.2.gemfile.lock
+++ b/gemfiles/3.2.gemfile.lock
@@ -1,39 +1,39 @@
 PATH
-  remote: /Users/draper/Dropbox/Development/shoulda-matchers
+  remote: /Users/croaky/dev/shoulda-matchers
   specs:
     shoulda-matchers (1.5.0)
       activesupport (>= 3.0.0)
-      bourne (~> 1.2.0)
+      bourne (~> 1.3)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.9)
-      actionpack (= 3.2.9)
-      mail (~> 2.4.4)
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-    activesupport (3.2.9)
-      i18n (~> 0.6)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
     appraisal (0.5.1)
       bundler
@@ -43,77 +43,79 @@ GEM
       childprocess (~> 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    bourne (1.2.1)
-      mocha (= 0.12.7)
+    bourne (1.4.0)
+      mocha (~> 0.13.2)
     builder (3.0.4)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
-    cucumber (1.2.1)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    cucumber (1.2.3)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
-    diff-lcs (1.1.3)
+      gherkin (~> 2.11.6)
+      multi_json (~> 1.3)
+    diff-lcs (1.2.1)
     erubis (2.7.0)
-    ffi (1.3.1)
-    gherkin (2.11.5)
-      json (>= 1.4.6)
+    ffi (1.4.0)
+    gherkin (2.11.6)
+      json (>= 1.7.6)
     hike (1.2.1)
     i18n (0.6.1)
     journey (1.0.4)
-    jquery-rails (2.2.0)
+    jquery-rails (2.2.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.7.6)
-    mail (2.4.4)
+    json (1.7.7)
+    mail (2.5.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.19)
-    mocha (0.12.7)
+    mime-types (1.21)
+    mocha (0.13.3)
       metaclass (~> 0.0.1)
-    multi_json (1.5.0)
+    multi_json (1.7.1)
     polyglot (0.3.3)
-    rack (1.4.4)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.9)
-      actionmailer (= 3.2.9)
-      actionpack (= 3.2.9)
-      activerecord (= 3.2.9)
-      activeresource (= 3.2.9)
-      activesupport (= 3.2.9)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
       bundler (~> 1.0)
-      railties (= 3.2.9)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.0.3)
-    rdoc (3.12)
+    rdoc (3.12.2)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    rspec-rails (2.8.1)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    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 (~> 2.8.0)
-    sass (3.2.5)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    sass (3.2.7)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
@@ -125,16 +127,16 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.7)
-    strong_parameters (0.1.6)
+    strong_parameters (0.2.0)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
       railties (~> 3.0)
-    thor (0.16.0)
-    tilt (1.3.3)
+    thor (0.17.0)
+    tilt (1.3.6)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
@@ -151,7 +153,8 @@ DEPENDENCIES
   jruby-openssl
   rails (~> 3.2.8)
   rake (>= 0.9.2)
-  rspec-rails (~> 2.8.1)
+  rspec (~> 2.13)
+  rspec-rails (~> 2.13)
   sass-rails
   shoulda-context (~> 1.0.0)
   shoulda-matchers!
diff --git a/lib/shoulda/matchers/integrations/rspec.rb b/lib/shoulda/matchers/integrations/rspec.rb
index 755a6568..1db7231c 100644
--- a/lib/shoulda/matchers/integrations/rspec.rb
+++ b/lib/shoulda/matchers/integrations/rspec.rb
@@ -1,5 +1,5 @@
 # :enddoc:
-require 'rspec'
+require 'rspec/rails'
 
 RSpec.configure do |config|
   require 'shoulda/matchers/independent'
diff --git a/shoulda-matchers.gemspec b/shoulda-matchers.gemspec
index ba1cb4dc..c9c6e2ce 100644
--- a/shoulda-matchers.gemspec
+++ b/shoulda-matchers.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency('activesupport', '>= 3.0.0')
-  s.add_dependency('bourne',        '~> 1.2.0')
+  s.add_dependency('bourne', '~> 1.3')
 
   s.add_development_dependency('appraisal',   '~> 0.4')
   s.add_development_dependency('aruba')
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('cucumber',    '~> 1.1')
   s.add_development_dependency('rails',       '~> 3.0')
   s.add_development_dependency('rake',        '>= 0.9.2')
-  s.add_development_dependency('rspec-rails', '~> 2.8.1')
+  s.add_development_dependency('rspec',       '~> 2.13')
+  s.add_development_dependency('rspec-rails', '~> 2.13')
   s.add_development_dependency('strong_parameters')
 end
diff --git a/spec/shoulda/matchers/active_record/association_matcher_spec.rb b/spec/shoulda/matchers/active_record/association_matcher_spec.rb
index 92ef41cf..6f0f76a0 100644
--- a/spec/shoulda/matchers/active_record/association_matcher_spec.rb
+++ b/spec/shoulda/matchers/active_record/association_matcher_spec.rb
@@ -178,10 +178,12 @@ describe Shoulda::Matchers::ActiveRecord::AssociationMatcher do
 
     it 'rejects an association that has the wrong :through option' do
       define_model :child
+
       define_model :conception, :child_id => :integer,
         :parent_id => :integer do
         belongs_to :child
-        end
+      end
+
       define_model :parent do
         has_many :conceptions
         has_many :relationships
@@ -264,6 +266,7 @@ describe Shoulda::Matchers::ActiveRecord::AssociationMatcher do
       define_model :child, :ancestor_id => :integer do
         belongs_to :ancestor, :inverse_of => :children, :class_name => :Parent
       end
+
       define_model :parent do
         has_many :children, :inverse_of => :ancestor
       end
@@ -275,6 +278,7 @@ describe Shoulda::Matchers::ActiveRecord::AssociationMatcher do
       define_model :child, :mother_id => :integer do
         belongs_to :mother, :inverse_of => :children, :class_name => :Parent
       end
+
       define_model :parent do
         has_many :children, :inverse_of => :ancestor
       end
diff --git a/spec/support/model_builder.rb b/spec/support/model_builder.rb
index 91d4012b..6391904d 100644
--- a/spec/support/model_builder.rb
+++ b/spec/support/model_builder.rb
@@ -7,6 +7,7 @@ module ModelBuilder
 
       after do
         drop_created_tables
+        ActiveSupport::Dependencies.clear
       end
     end
   end