diff --git a/Gemfile b/Gemfile
index e4413a7..c80ee36 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,3 @@
 source "http://rubygems.org"
 
-gem "activerecord", ">= 3.0.0", require: false
-
 gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
index a04767a..0828291 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -22,10 +22,11 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    appraisal (0.5.2)
+    appraisal (1.0.0)
       bundler
       rake
-    arel (4.0.0)
+      thor (>= 0.14.0)
+    arel (4.0.2)
     aruba (0.5.3)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
@@ -37,25 +38,27 @@ GEM
     builder (3.1.4)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.2.5)
+    cucumber (1.3.15)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.7)
-      multi_json (~> 1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.1)
     diff-lcs (1.1.3)
     ffi (1.9.0)
     ffi (1.9.0-java)
-    gherkin (2.11.8)
+    gherkin (2.12.2)
       multi_json (~> 1.3)
-    gherkin (2.11.8-java)
+    gherkin (2.12.2-java)
       multi_json (~> 1.3)
     i18n (0.6.4)
     metaclass (0.0.1)
     minitest (4.7.5)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.7.7)
-    rake (10.1.0)
+    multi_json (1.10.1)
+    multi_test (0.1.1)
+    rake (10.3.2)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -69,6 +72,7 @@ GEM
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     sqlite3 (1.3.8)
+    thor (0.19.1)
     thread_safe (0.1.2)
       atomic
     thread_safe (0.1.2-java)
@@ -83,10 +87,10 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (>= 3.0.0)
-  appraisal (~> 0.5.1)
+  appraisal (~> 1.0.0)
   aruba
   bourne
-  cucumber (~> 1.2.1)
+  cucumber (~> 1.3.15)
   factory_girl!
   mocha (>= 0.12.8)
   rspec (~> 2.12.0)
diff --git a/factory_girl.gemspec b/factory_girl.gemspec
index b500dbb..d1de086 100644
--- a/factory_girl.gemspec
+++ b/factory_girl.gemspec
@@ -24,13 +24,14 @@ Gem::Specification.new do |s|
   s.add_dependency("activesupport", ">= 3.0.0")
 
   s.add_development_dependency("rspec",    "~> 2.12.0")
-  s.add_development_dependency("cucumber", "~> 1.2.1")
+  s.add_development_dependency("cucumber", "~> 1.3.15")
   s.add_development_dependency("timecop")
   s.add_development_dependency("simplecov")
   s.add_development_dependency("aruba")
   s.add_development_dependency("mocha", ">= 0.12.8")
   s.add_development_dependency("bourne")
-  s.add_development_dependency("appraisal", "~> 0.5.1")
+  s.add_development_dependency("appraisal", "~> 1.0.0")
+  s.add_development_dependency("activerecord", ">= 3.0.0")
 
   if RUBY_PLATFORM == "java"
     s.add_development_dependency("activerecord-jdbcsqlite3-adapter")
diff --git a/gemfiles/3.1.gemfile b/gemfiles/3.1.gemfile
index fe90aab..926f4b1 100644
--- a/gemfiles/3.1.gemfile
+++ b/gemfiles/3.1.gemfile
@@ -4,4 +4,4 @@ source "http://rubygems.org"
 
 gem "activerecord", "~> 3.1.12"
 
-gemspec :path=>"../"
\ No newline at end of file
+gemspec :path => "../"
diff --git a/gemfiles/3.1.gemfile.lock b/gemfiles/3.1.gemfile.lock
index cff0368..2b7a59e 100644
--- a/gemfiles/3.1.gemfile.lock
+++ b/gemfiles/3.1.gemfile.lock
@@ -18,37 +18,41 @@ GEM
       tzinfo (~> 0.3.29)
     activesupport (3.1.12)
       multi_json (~> 1.0)
-    appraisal (0.5.2)
+    appraisal (1.0.0)
       bundler
       rake
+      thor (>= 0.14.0)
     arel (2.2.3)
     aruba (0.5.3)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    bourne (1.4.0)
-      mocha (~> 0.13.2)
+    bourne (1.5.0)
+      mocha (>= 0.13.2, < 0.15)
     builder (3.0.4)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.2.5)
+    cucumber (1.3.15)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.7)
-      multi_json (~> 1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.1)
     diff-lcs (1.1.3)
-    ffi (1.9.0)
-    ffi (1.9.0-java)
-    gherkin (2.11.8)
+    docile (1.1.3)
+    ffi (1.9.3)
+    ffi (1.9.3-java)
+    gherkin (2.12.2)
       multi_json (~> 1.3)
-    gherkin (2.11.8-java)
+    gherkin (2.12.2-java)
       multi_json (~> 1.3)
-    i18n (0.6.4)
-    metaclass (0.0.1)
-    mocha (0.13.3)
+    i18n (0.6.9)
+    metaclass (0.0.4)
+    mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.7.7)
-    rake (10.1.0)
+    multi_json (1.10.1)
+    multi_test (0.1.1)
+    rake (10.3.2)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -57,14 +61,16 @@ GEM
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.2)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     sqlite3 (1.3.8)
-    timecop (0.6.1)
-    tzinfo (0.3.37)
-    yard (0.8.6.1)
+    thor (0.19.1)
+    timecop (0.7.1)
+    tzinfo (0.3.39)
+    yard (0.8.7.3)
 
 PLATFORMS
   java
@@ -72,10 +78,10 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 3.1.12)
-  appraisal (~> 0.5.1)
+  appraisal (~> 1.0.0)
   aruba
   bourne
-  cucumber (~> 1.2.1)
+  cucumber (~> 1.3.15)
   factory_girl!
   mocha (>= 0.12.8)
   rspec (~> 2.12.0)
diff --git a/gemfiles/3.2.gemfile b/gemfiles/3.2.gemfile
index 777afb4..d594899 100644
--- a/gemfiles/3.2.gemfile
+++ b/gemfiles/3.2.gemfile
@@ -4,4 +4,4 @@ source "http://rubygems.org"
 
 gem "activerecord", "~> 3.2.15"
 
-gemspec :path=>"../"
\ No newline at end of file
+gemspec :path => "../"
diff --git a/gemfiles/3.2.gemfile.lock b/gemfiles/3.2.gemfile.lock
index 3d6e782..bd3ba18 100644
--- a/gemfiles/3.2.gemfile.lock
+++ b/gemfiles/3.2.gemfile.lock
@@ -1,5 +1,5 @@
 PATH
-  remote: /Users/joshuaclayton/dev/gems/factory_girl
+  remote: ../
   specs:
     factory_girl (4.4.0)
       activesupport (>= 3.0.0)
@@ -18,9 +18,10 @@ GEM
     activesupport (3.2.15)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    appraisal (0.5.2)
+    appraisal (1.0.0)
       bundler
       rake
+      thor (>= 0.14.0)
     arel (3.0.2)
     aruba (0.5.3)
       childprocess (>= 0.3.6)
@@ -31,21 +32,27 @@ GEM
     builder (3.0.4)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.2.5)
+    cucumber (1.3.15)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.7)
-      multi_json (~> 1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.1)
     diff-lcs (1.1.3)
+    docile (1.1.3)
     ffi (1.9.3)
-    gherkin (2.11.8)
+    ffi (1.9.3-java)
+    gherkin (2.12.2)
       multi_json (~> 1.3)
-    i18n (0.6.5)
-    metaclass (0.0.1)
+    gherkin (2.12.2-java)
+      multi_json (~> 1.3)
+    i18n (0.6.9)
+    metaclass (0.0.4)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.8.2)
-    rake (10.1.0)
+    multi_json (1.10.1)
+    multi_test (0.1.1)
+    rake (10.3.2)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -54,24 +61,27 @@ GEM
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.2)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     sqlite3 (1.3.8)
-    timecop (0.6.3)
-    tzinfo (0.3.38)
+    thor (0.19.1)
+    timecop (0.7.1)
+    tzinfo (0.3.39)
     yard (0.8.7.3)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   activerecord (~> 3.2.15)
-  appraisal (~> 0.5.1)
+  appraisal (~> 1.0.0)
   aruba
   bourne
-  cucumber (~> 1.2.1)
+  cucumber (~> 1.3.15)
   factory_girl!
   mocha (>= 0.12.8)
   rspec (~> 2.12.0)
diff --git a/gemfiles/4.0.gemfile b/gemfiles/4.0.gemfile
index 3af9a4a..cf81ff2 100644
--- a/gemfiles/4.0.gemfile
+++ b/gemfiles/4.0.gemfile
@@ -4,4 +4,4 @@ source "http://rubygems.org"
 
 gem "activerecord", "~> 4.0.1"
 
-gemspec :path=>"../"
\ No newline at end of file
+gemspec :path => "../"
diff --git a/gemfiles/4.0.gemfile.lock b/gemfiles/4.0.gemfile.lock
index c877659..e513c09 100644
--- a/gemfiles/4.0.gemfile.lock
+++ b/gemfiles/4.0.gemfile.lock
@@ -1,5 +1,5 @@
 PATH
-  remote: ..
+  remote: ../
   specs:
     factory_girl (4.4.0)
       activesupport (>= 3.0.0)
@@ -7,55 +7,57 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (4.0.1)
-      activesupport (= 4.0.1)
+    activemodel (4.0.5)
+      activesupport (= 4.0.5)
       builder (~> 3.1.0)
-    activerecord (4.0.1)
-      activemodel (= 4.0.1)
+    activerecord (4.0.5)
+      activemodel (= 4.0.5)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.1)
+      activesupport (= 4.0.5)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.1)
-      i18n (~> 0.6, >= 0.6.4)
+    activesupport (4.0.5)
+      i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    appraisal (0.5.2)
+    appraisal (1.0.0)
       bundler
       rake
-    arel (4.0.1)
+      thor (>= 0.14.0)
+    arel (4.0.2)
     aruba (0.5.3)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    atomic (1.1.14)
-    atomic (1.1.14-java)
     bourne (1.5.0)
       mocha (>= 0.13.2, < 0.15)
     builder (3.1.4)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.2.5)
+    cucumber (1.3.15)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.7)
-      multi_json (~> 1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.1)
     diff-lcs (1.1.3)
+    docile (1.1.3)
     ffi (1.9.3)
     ffi (1.9.3-java)
-    gherkin (2.11.8)
+    gherkin (2.12.2)
       multi_json (~> 1.3)
-    gherkin (2.11.8-java)
+    gherkin (2.12.2-java)
       multi_json (~> 1.3)
-    i18n (0.6.5)
-    metaclass (0.0.1)
+    i18n (0.6.9)
+    metaclass (0.0.4)
     minitest (4.7.5)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.8.2)
-    rake (10.1.0)
+    multi_json (1.10.1)
+    multi_test (0.1.1)
+    rake (10.3.2)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -64,17 +66,17 @@ GEM
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.2)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     sqlite3 (1.3.8)
-    thread_safe (0.1.3)
-      atomic
-    thread_safe (0.1.3-java)
-      atomic
-    timecop (0.6.3)
-    tzinfo (0.3.38)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    thread_safe (0.3.4-java)
+    timecop (0.7.1)
+    tzinfo (0.3.39)
     yard (0.8.7.3)
 
 PLATFORMS
@@ -83,10 +85,10 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 4.0.1)
-  appraisal (~> 0.5.1)
+  appraisal (~> 1.0.0)
   aruba
   bourne
-  cucumber (~> 1.2.1)
+  cucumber (~> 1.3.15)
   factory_girl!
   mocha (>= 0.12.8)
   rspec (~> 2.12.0)