diff --git a/.gitignore b/.gitignore
index ac7f26a..4b5cedc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 pkg/
 .bundle/
 .rvmrc
+Gemfile.lock
diff --git a/Gemfile b/Gemfile
index bc75700..58a5143 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,15 +2,17 @@ source 'http://rubygems.org'
 
 gemspec
 
-gem 'ZenTest'
-gem 'rails', '3.0.7'
-gem 'rspec', '~> 2.4'
-gem 'rspec-rails', '~> 2.4'
+gem 'rails', '3.0.10'
+gem 'rspec', '~> 2.6'
+gem 'rspec-rails', '~> 2.6'
 gem 'timecop'
 gem 'rspec_tag_matchers'
+gem 'ruby-debug', :platforms => [:ruby_18, :jruby]
+gem 'ruby-debug19', :platforms => [:ruby_19]
 
 group :mongoid do
-  gem 'mongoid', '2.0.0.rc.8'
+  gem 'mongoid', '2.2.0'
+  gem 'system_timer', :platforms => [:ruby_18]
 end
 
 group :active_record do
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index 48988ff..0000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,118 +0,0 @@
-PATH
-  remote: .
-  specs:
-    validates_timeliness (3.0.6)
-      timeliness (~> 0.3.3)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    ZenTest (4.5.0)
-    abstract (1.0.0)
-    actionmailer (3.0.7)
-      actionpack (= 3.0.7)
-      mail (~> 2.2.15)
-    actionpack (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-    activesupport (3.0.7)
-    arel (2.0.9)
-    bson (1.3.0)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.5.0)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    mongo (1.3.0)
-      bson (>= 1.3.0)
-    mongoid (2.0.0.rc.8)
-      activemodel (~> 3.0)
-      mongo (~> 1.2)
-      tzinfo (~> 0.3.22)
-      will_paginate (~> 3.0.pre)
-    nokogiri (1.4.4)
-    polyglot (0.3.1)
-    rack (1.2.2)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails (3.0.7)
-      actionmailer (= 3.0.7)
-      actionpack (= 3.0.7)
-      activerecord (= 3.0.7)
-      activeresource (= 3.0.7)
-      activesupport (= 3.0.7)
-      bundler (~> 1.0)
-      railties (= 3.0.7)
-    railties (3.0.7)
-      actionpack (= 3.0.7)
-      activesupport (= 3.0.7)
-      rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.8.7)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    rspec-rails (2.5.0)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.5.0)
-    rspec_tag_matchers (1.0.0)
-      nokogiri (>= 1.4.0)
-      rspec-rails (>= 1.2.6)
-    sqlite3 (1.3.3)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    thor (0.14.6)
-    timecop (0.3.5)
-    timeliness (0.3.3)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.27)
-    will_paginate (3.0.pre2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  ZenTest
-  mongoid (= 2.0.0.rc.8)
-  rails (= 3.0.7)
-  rspec (~> 2.4)
-  rspec-rails (~> 2.4)
-  rspec_tag_matchers
-  sqlite3-ruby
-  timecop
-  validates_timeliness!