diff --git a/Gemfile b/Gemfile
index f2a1669..f489b6d 100755
--- a/Gemfile
+++ b/Gemfile
@@ -1,40 +1,46 @@
 source "http://rubygems.org"
+# group :development do
+#   # gem "mysql"
+#   # gem "json_pure", "1.4.3"
+# 
+# 
+#   # gem "datamapper",        "1.0.0"
+#   # gem "dm-migrations",     "1.0.0"
+#   # gem "dm-sqlite-adapter", "1.0.0"
+#   
+#   # mongo requirements
+#     # gem "mongo",     "1.0.1"
+#     # gem "mongo_ext", "0.19.3"
+#     # gem "bson_ext",  "1.0.1"
+# end
+
 group :development do
-  gem "mysql"
-  gem "json_pure", "1.4.3"
-  gem "rspec", "1.3.0"
-  gem "rcov"
-  gem "cucumber", "0.8.1"
-  
-  gem "activerecord"
-
-  gem "datamapper",        "1.0.0"
-  gem "dm-migrations",     "1.0.0"
-  gem "dm-sqlite-adapter", "1.0.0"
-  
-  # mongo requirements
-    gem "mongo",     "1.0.1"
-    gem "mongo_ext", "0.19.3"
-    gem "bson_ext",  "1.0.1"
-    
-  gem "mongoid", "1.9.0"
-    #mongoid requires active support <= 2.3.5
-    gem "activesupport", "<= 2.3.5"   
-    
-    gem "tzinfo"
-   
-  #temp from git as last released gemspec depends on mongo 1.0 exactly...
-  gem "mongo_mapper", :git => "git://github.com/JonRowe/mongomapper.git"
-
-  gem "couch_potato"
-
   gem "rake"
   gem "ruby-debug"
-  gem 'sqlite3-ruby'
-
-  gem "ZenTest"
-
+  
   gem "bundler"
   gem "jeweler"
+  
+  gem "json_pure"
+  
+  #ORM's
+  gem "activerecord",         "2.3.8"
+  gem "datamapper",           "1.0.0"
+    gem "dm-migrations",      "1.0.0"
+    gem "dm-sqlite-adapter",  "1.0.0"
+  gem "mongoid",              "1.9.1"
+    gem "tzinfo",             "0.3.22"
+  gem "mongo_mapper",         "0.8.2"
+  gem "couch_potato",         "0.3.0"
 end
 
+group :test do
+  gem "rspec"
+  gem "rcov"
+  gem "ZenTest"
+end
+
+group :cucumber do
+  gem "cucumber"
+  gem 'sqlite3-ruby'
+end
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 4378011..bf24278 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,123 +4,101 @@ dependencies:
     group: 
     - :development
     version: ">= 0"
-  tzinfo: 
-    group: 
-    - :development
-    version: ">= 0"
   datamapper: 
     group: 
     - :development
     version: = 1.0.0
-  mongo: 
+  tzinfo: 
     group: 
     - :development
-    version: = 1.0.1
-  bson_ext: 
-    group: 
-    - :development
-    version: = 1.0.1
+    version: = 0.3.22
   ZenTest: 
     group: 
-    - :development
-    version: ">= 0"
-  activerecord: 
-    group: 
-    - :development
+    - :test
     version: ">= 0"
   mongo_mapper: 
     group: 
     - :development
-    version: ">= 0"
-  mongo_ext: 
+    version: = 0.8.2
+  activerecord: 
     group: 
     - :development
-    version: = 0.19.3
-  mysql: 
+    version: = 2.3.8
+  sqlite3-ruby: 
     group: 
-    - :development
+    - :cucumber
     version: ">= 0"
   rake: 
     group: 
     - :development
     version: ">= 0"
-  sqlite3-ruby: 
+  rspec: 
     group: 
-    - :development
+    - :test
     version: ">= 0"
   couch_potato: 
     group: 
     - :development
-    version: ">= 0"
-  rspec: 
-    group: 
-    - :development
-    version: = 1.3.0
+    version: = 0.3.0
   rcov: 
     group: 
-    - :development
+    - :test
     version: ">= 0"
   jeweler: 
     group: 
     - :development
     version: ">= 0"
+  bundler: 
+    group: 
+    - :development
+    version: ">= 0"
   dm-sqlite-adapter: 
     group: 
     - :development
     version: = 1.0.0
-  bundler: 
-    group: 
-    - :development
-    version: ">= 0"
   mongoid: 
     group: 
     - :development
-    version: = 1.9.0
-  cucumber: 
-    group: 
-    - :development
-    version: = 0.8.1
+    version: = 1.9.1
   json_pure: 
     group: 
     - :development
-    version: = 1.4.3
+    version: ">= 0"
+  cucumber: 
+    group: 
+    - :cucumber
+    version: ">= 0"
   dm-migrations: 
     group: 
     - :development
     version: = 1.0.0
-  activesupport: 
-    group: 
-    - :development
-    version: <= 2.3.5
 specs: 
 - rake: 
     version: 0.8.7
 - ZenTest: 
     version: 4.3.3
 - activesupport: 
-    version: 2.3.5
+    version: 2.3.8
 - activerecord: 
-    version: 2.3.5
+    version: 2.3.8
 - addressable: 
     version: 2.1.2
 - bson: 
-    version: 1.0.1
-- bson_ext: 
-    version: 1.0.1
+    version: 1.0.4
 - builder: 
     version: 2.1.2
 - bundler: 
     version: 0.9.26
 - columnize: 
     version: 0.3.1
+- json: 
+    version: 1.2.4
 - mime-types: 
     version: "1.16"
 - rest-client: 
     version: 1.6.0
 - couchrest: 
-    version: "0.37"
-- json: 
-    version: 1.4.3
+    version: 1.0.0
 - couch_potato: 
     version: 0.3.0
 - diff-lcs: 
@@ -128,13 +106,13 @@ specs:
 - trollop: 
     version: 1.16.2
 - gherkin: 
-    version: 2.0.2
+    version: 2.1.5
 - json_pure: 
-    version: 1.4.3
+    version: 1.4.5
 - term-ansicolor: 
     version: 1.0.5
 - cucumber: 
-    version: 0.8.1
+    version: 0.8.5
 - data_objects: 
     version: 0.10.2
 - extlib: 
@@ -186,20 +164,15 @@ specs:
 - linecache: 
     version: "0.43"
 - mongo: 
-    version: 1.0.1
-- mongo_ext: 
-    version: 0.19.3
+    version: 1.0.7
 - plucky: 
-    version: 0.2.1
+    version: 0.3.2
 - mongo_mapper: 
-    version: 0.7.6
-    source: 0
+    version: 0.8.2
 - will_paginate: 
     version: 2.3.14
 - mongoid: 
-    version: 1.9.0
-- mysql: 
-    version: 2.8.1
+    version: 1.9.1
 - rcov: 
     version: 0.9.8
 - rspec: 
@@ -212,11 +185,7 @@ specs:
     version: 1.3.1
 - tzinfo: 
     version: 0.3.22
-hash: 7d202bd54bdf1b33184ddd9d32fd7289a1277842
+hash: 8088b8205ec9d023abb1779ce28e4a920f0cc13d
 sources: 
-- Git: 
-    uri: git://github.com/JonRowe/mongomapper.git
-    git: git://github.com/JonRowe/mongomapper.git
-    ref: 1bae62df3aea1870a948972c95d7198ddd8f39aa
 - Rubygems: 
     uri: http://rubygems.org
diff --git a/spec/rcov.opts b/spec/rcov.opts
index cf154ee..263b944 100644
--- a/spec/rcov.opts
+++ b/spec/rcov.opts
@@ -1 +1 @@
---exclude "spec/*,vendor/*,examples/*,features/*,Users/*/.rvm/gems/*/gems/"
\ No newline at end of file
+--exclude "spec/*,vendor/*,examples/*,features/*,Users/*/.rvm/gems/*/gems/*"
\ No newline at end of file