diff --git a/.travis.yml b/.travis.yml
index e921fe367..85652c2dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,3 +7,4 @@ gemfile:
   - gemfiles/2.1.gemfile
   - gemfiles/2.3.gemfile
   - gemfiles/3.0.gemfile
+  - gemfiles/3.1.gemfile
diff --git a/Appraisals b/Appraisals
index 5bdd6da60..85512fe7e 100644
--- a/Appraisals
+++ b/Appraisals
@@ -11,3 +11,6 @@ appraise "3.0" do
   gem "activerecord", "~> 3.0"
 end
 
+appraise "3.1" do
+  gem "activerecord", "~> 3.1"
+end
diff --git a/Gemfile b/Gemfile
index 7aadbd461..246cee6ae 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,14 +1,5 @@
 source "http://rubygems.org"
-gem "cucumber", "~> 1.0.0"
-gem "rake"
-gem "rspec", "~> 2.0"
-gem "rcov"
+
 gem "activerecord", :require => false
-gem "activesupport", :require => false
-gem "mocha"
-gem "bourne"
-gem "sqlite3-ruby", :require => false
-gem "appraisal", "~> 0.3.5"
-gem "yard"
-gem "bluecloth"
 
+gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
index 9155a41d4..5dc2db9fa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,48 +1,61 @@
+PATH
+  remote: .
+  specs:
+    factory_girl (2.0.5)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-      arel (~> 1.0.0)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.1)
-    appraisal (0.3.5)
-      aruba (~> 0.3.6)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
+    appraisal (0.3.8)
       bundler
       rake
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    aruba (0.3.7)
-      childprocess (>= 0.1.9)
-      cucumber (>= 0.10.5)
+    arel (2.2.1)
+    aruba (0.4.6)
+      bcat (>= 0.6.1)
+      childprocess (>= 0.2.0)
+      cucumber (>= 1.0.2)
+      rdiscount (>= 1.6.8)
       rspec (>= 2.6.0)
-    bluecloth (2.0.9)
+    bcat (0.6.1)
+      rack (~> 1.0)
+    bcrypt-ruby (3.0.0)
+    bluecloth (2.1.0)
     bourne (1.0)
       mocha (= 0.9.8)
-    builder (2.1.2)
-    childprocess (0.1.9)
+    builder (3.0.0)
+    childprocess (0.2.2)
       ffi (~> 1.0.6)
-    cucumber (1.0.0)
+    cucumber (1.0.2)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.1)
+      gherkin (~> 2.4.5)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     ffi (1.0.9)
-    gherkin (2.4.1)
+    gherkin (2.4.16)
       json (>= 1.4.6)
-    i18n (0.4.2)
-    json (1.5.3)
+    i18n (0.6.0)
+    json (1.5.4)
     mocha (0.9.8)
       rake
+    multi_json (1.0.3)
+    rack (1.3.2)
     rake (0.9.2)
-    rcov (0.9.9)
+    rcov (0.9.10)
+    rdiscount (1.6.8)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -51,23 +64,25 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    sqlite3-ruby (1.3.2)
-    term-ansicolor (1.0.5)
-    tzinfo (0.3.23)
-    yard (0.6.4)
+    sqlite3 (1.3.4)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    term-ansicolor (1.0.6)
+    tzinfo (0.3.29)
+    yard (0.7.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activerecord
-  activesupport
-  appraisal (~> 0.3.5)
+  appraisal (~> 0.3.8)
+  aruba
   bluecloth
   bourne
   cucumber (~> 1.0.0)
+  factory_girl!
   mocha
-  rake
   rcov
   rspec (~> 2.0)
   sqlite3-ruby
diff --git a/factory_girl.gemspec b/factory_girl.gemspec
index 7da7af708..699e4a6ee 100644
--- a/factory_girl.gemspec
+++ b/factory_girl.gemspec
@@ -17,15 +17,16 @@ Gem::Specification.new do |s|
     s.email   = %q{jferris@thoughtbot.com}
     s.homepage = "https://github.com/thoughtbot/factory_girl"
 
-    s.add_development_dependency('rcov')
-    s.add_development_dependency('rspec')
-    s.add_development_dependency('cucumber')
-    s.add_development_dependency('activerecord', '~>2.3.5')
-    s.add_development_dependency('activerecord', '~>3.0.0.beta3')
-    s.add_development_dependency('mocha')
-    s.add_development_dependency('bourne')
-    s.add_development_dependency('sqlite3')
-    s.add_development_dependency('aruba')
+    s.add_development_dependency("rspec",    "~> 2.0")
+    s.add_development_dependency("cucumber", "~> 1.0.0")
+    s.add_development_dependency("rcov")
+    s.add_development_dependency("aruba")
+    s.add_development_dependency("mocha")
+    s.add_development_dependency("bourne")
+    s.add_development_dependency("appraisal", "~> 0.3.8")
+    s.add_development_dependency("sqlite3-ruby")
+    s.add_development_dependency("yard")
+    s.add_development_dependency("bluecloth")
 
     s.platform = Gem::Platform::RUBY
     s.rubygems_version = %q{1.2.0}
diff --git a/gemfiles/2.1.gemfile b/gemfiles/2.1.gemfile
index a79887546..246fd2aaa 100644
--- a/gemfiles/2.1.gemfile
+++ b/gemfiles/2.1.gemfile
@@ -2,17 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "cucumber", "~> 1.0.0"
-gem "rake"
-gem "rspec", "~> 2.0"
-gem "rcov"
 gem "activerecord", "~> 2.1"
-gem "activesupport", :require=>false
-gem "mocha"
-gem "bourne"
-gem "sqlite3-ruby", :require=>false
-gem "appraisal", "~> 0.3.5"
-gem "yard"
-gem "bluecloth"
 gem "test-unit", "~> 2.3.0", :platforms=>[:mri_19]
 
+gemspec :path=>"../"
\ No newline at end of file
diff --git a/gemfiles/2.1.gemfile.lock b/gemfiles/2.1.gemfile.lock
index a0c651ac7..ffae7452e 100644
--- a/gemfiles/2.1.gemfile.lock
+++ b/gemfiles/2.1.gemfile.lock
@@ -1,11 +1,15 @@
+PATH
+  remote: /Users/joshuaclayton/dev/gems/factory_girl
+  specs:
+    factory_girl (2.0.5)
+
 GEM
   remote: http://rubygems.org/
   specs:
     activerecord (2.3.12)
       activesupport (= 2.3.12)
     activesupport (2.3.12)
-    appraisal (0.3.5)
-      aruba (~> 0.3.6)
+    appraisal (0.3.8)
       bundler
       rake
     aruba (0.3.7)
@@ -53,13 +57,13 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 2.1)
-  activesupport
-  appraisal (~> 0.3.5)
+  appraisal (~> 0.3.8)
+  aruba
   bluecloth
   bourne
   cucumber (~> 1.0.0)
+  factory_girl!
   mocha
-  rake
   rcov
   rspec (~> 2.0)
   sqlite3-ruby
diff --git a/gemfiles/2.3.gemfile b/gemfiles/2.3.gemfile
index c00afc1a9..607888e9f 100644
--- a/gemfiles/2.3.gemfile
+++ b/gemfiles/2.3.gemfile
@@ -2,16 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "cucumber", "~> 1.0.0"
-gem "rake"
-gem "rspec", "~> 2.0"
-gem "rcov"
 gem "activerecord", "~> 2.3"
-gem "activesupport", :require=>false
-gem "mocha"
-gem "bourne"
-gem "sqlite3-ruby", :require=>false
-gem "appraisal", "~> 0.3.5"
-gem "yard"
-gem "bluecloth"
 
+gemspec :path=>"../"
\ No newline at end of file
diff --git a/gemfiles/2.3.gemfile.lock b/gemfiles/2.3.gemfile.lock
index 3ce919690..f89207514 100644
--- a/gemfiles/2.3.gemfile.lock
+++ b/gemfiles/2.3.gemfile.lock
@@ -1,11 +1,15 @@
+PATH
+  remote: /Users/joshuaclayton/dev/gems/factory_girl
+  specs:
+    factory_girl (2.0.5)
+
 GEM
   remote: http://rubygems.org/
   specs:
     activerecord (2.3.12)
       activesupport (= 2.3.12)
     activesupport (2.3.12)
-    appraisal (0.3.5)
-      aruba (~> 0.3.6)
+    appraisal (0.3.8)
       bundler
       rake
     aruba (0.3.7)
@@ -52,13 +56,13 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 2.3)
-  activesupport
-  appraisal (~> 0.3.5)
+  appraisal (~> 0.3.8)
+  aruba
   bluecloth
   bourne
   cucumber (~> 1.0.0)
+  factory_girl!
   mocha
-  rake
   rcov
   rspec (~> 2.0)
   sqlite3-ruby
diff --git a/gemfiles/3.0.gemfile b/gemfiles/3.0.gemfile
index 49cc855b2..68518b8cb 100644
--- a/gemfiles/3.0.gemfile
+++ b/gemfiles/3.0.gemfile
@@ -2,16 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "cucumber", "~> 1.0.0"
-gem "rake"
-gem "rspec", "~> 2.0"
-gem "rcov"
 gem "activerecord", "~> 3.0"
-gem "activesupport", :require=>false
-gem "mocha"
-gem "bourne"
-gem "sqlite3-ruby", :require=>false
-gem "appraisal", "~> 0.3.5"
-gem "yard"
-gem "bluecloth"
 
+gemspec :path=>"../"
\ No newline at end of file
diff --git a/gemfiles/3.0.gemfile.lock b/gemfiles/3.0.gemfile.lock
index a2bd54177..92620bc27 100644
--- a/gemfiles/3.0.gemfile.lock
+++ b/gemfiles/3.0.gemfile.lock
@@ -1,3 +1,8 @@
+PATH
+  remote: /Users/joshuaclayton/dev/gems/factory_girl
+  specs:
+    factory_girl (2.0.5)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -11,8 +16,7 @@ GEM
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
     activesupport (3.0.9)
-    appraisal (0.3.5)
-      aruba (~> 0.3.6)
+    appraisal (0.3.8)
       bundler
       rake
     arel (2.0.10)
@@ -62,13 +66,13 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 3.0)
-  activesupport
-  appraisal (~> 0.3.5)
+  appraisal (~> 0.3.8)
+  aruba
   bluecloth
   bourne
   cucumber (~> 1.0.0)
+  factory_girl!
   mocha
-  rake
   rcov
   rspec (~> 2.0)
   sqlite3-ruby
diff --git a/gemfiles/3.1.gemfile b/gemfiles/3.1.gemfile
new file mode 100644
index 000000000..24d2ede49
--- /dev/null
+++ b/gemfiles/3.1.gemfile
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "activerecord", "~> 3.1"
+
+gemspec :path=>"../"
\ No newline at end of file
diff --git a/gemfiles/3.1.gemfile.lock b/gemfiles/3.1.gemfile.lock
new file mode 100644
index 000000000..e276d6db3
--- /dev/null
+++ b/gemfiles/3.1.gemfile.lock
@@ -0,0 +1,89 @@
+PATH
+  remote: /Users/joshuaclayton/dev/gems/factory_girl
+  specs:
+    factory_girl (2.0.5)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
+    appraisal (0.3.8)
+      bundler
+      rake
+    arel (2.2.1)
+    aruba (0.4.5)
+      bcat (>= 0.6.1)
+      childprocess (>= 0.1.9)
+      cucumber (>= 0.10.7)
+      rdiscount (>= 1.6.8)
+      rspec (>= 2.6.0)
+    bcat (0.6.1)
+      rack (~> 1.0)
+    bcrypt-ruby (3.0.0)
+    bluecloth (2.1.0)
+    bourne (1.0)
+      mocha (= 0.9.8)
+    builder (3.0.0)
+    childprocess (0.2.1)
+      ffi (~> 1.0.6)
+    cucumber (1.0.2)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.4.5)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
+    diff-lcs (1.1.3)
+    ffi (1.0.9)
+    gherkin (2.4.16)
+      json (>= 1.4.6)
+    i18n (0.6.0)
+    json (1.5.4)
+    mocha (0.9.8)
+      rake
+    multi_json (1.0.3)
+    rack (1.3.2)
+    rake (0.9.2)
+    rcov (0.9.10)
+    rdiscount (1.6.8)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    sqlite3 (1.3.4)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    term-ansicolor (1.0.6)
+    tzinfo (0.3.29)
+    yard (0.7.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.1)
+  appraisal (~> 0.3.8)
+  aruba
+  bluecloth
+  bourne
+  cucumber (~> 1.0.0)
+  factory_girl!
+  mocha
+  rcov
+  rspec (~> 2.0)
+  sqlite3-ruby
+  yard