diff --git a/Gemfile b/Gemfile
index 6b9d8ca5..8bee7578 100644
--- a/Gemfile
+++ b/Gemfile
@@ -64,8 +64,7 @@ group :test do
   gem "rr",              "1.0.2"
   gem "mocha",           "0.9.10"
   gem "redgreen",        "1.2.2"
-  gem "dm-sweatshop",    "~> 1.0.2", :git => "git://github.com/datamapper/dm-sweatshop.git"
-  gem "randexp",         "~> 0.1.5", :git => "git://github.com/snusnu/randexp", :branch => "no_parsetree"
+  gem "dm-sweatshop",    "~> 1.0.2"
   gem "pony",            "1.1"
   gem "notifo",          "0.1.0"
   gem "rack-test",       "0.5.7"
diff --git a/Gemfile.lock b/Gemfile.lock
index e0d6ae3c..084a0bd9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,18 +1,3 @@
-GIT
-  remote: git://github.com/datamapper/dm-sweatshop.git
-  revision: 45feec07bc68c927848b0b72aae1385f3ef91178
-  specs:
-    dm-sweatshop (1.0.2)
-      dm-core (~> 1.0.2)
-      randexp (~> 0.1.5)
-
-GIT
-  remote: git://github.com/snusnu/randexp
-  revision: 7866bf0e5670cf65a96bfb434f3e6dda4507ce5c
-  branch: no_parsetree
-  specs:
-    randexp (0.1.5)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -27,8 +12,8 @@ GEM
       tzinfo (~> 0.3.23)
     activesupport (3.0.3)
     addressable (2.2.2)
-    ansi (1.2.2)
-    arel (2.0.7)
+    ansi (1.4.1)
+    arel (2.0.10)
     bcat (0.5.2)
       rack (< 1.2)
     bcrypt-ruby (2.1.4)
@@ -37,9 +22,10 @@ GEM
       nap (~> 0.3)
     builder (2.1.2)
     bunny (0.6.0)
+    columnize (0.3.4)
     contest (0.1.2)
-    crack (0.1.8)
-    daemons (1.1.0)
+    crack (0.3.1)
+    daemons (1.1.4)
     data_objects (0.10.2)
       addressable (~> 2.1)
     delayed_job (2.1.2)
@@ -58,6 +44,9 @@ GEM
     dm-sqlite-adapter (1.0.2)
       dm-do-adapter (~> 1.0.2)
       do_sqlite3 (~> 0.10.2)
+    dm-sweatshop (1.0.2)
+      dm-core (~> 1.0.2)
+      randexp (~> 0.1.5)
     dm-timestamps (1.0.2)
       dm-core (~> 1.0.2)
     dm-types (1.0.2)
@@ -78,28 +67,36 @@ GEM
       crack (>= 0.1.1)
     i18n (0.5.0)
     json (1.4.6)
-    json_pure (1.4.6)
-    mail (2.2.14)
-      activesupport (>= 2.3.6)
+    json_pure (1.6.1)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
+    mime-types (1.17.2)
     mocha (0.9.10)
       rake
     nap (0.4)
     nokogiri (1.4.4)
     notifo (0.1.0)
       httparty (~> 0.4.5)
-    polyglot (0.3.1)
+    polyglot (0.3.3)
     pony (1.1)
       mail (> 2.0)
     rack (1.1.0)
     rack-test (0.5.7)
       rack (>= 1.0)
     rake (0.8.7)
+    randexp (0.1.6)
+    rbx-require-relative (0.0.5)
     redgreen (1.2.2)
     rr (1.0.2)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
     sinatra (1.1.2)
       rack (~> 1.1)
       tilt (~> 1.2)
@@ -108,12 +105,13 @@ GEM
     sqlite3-ruby (1.3.2)
     stringex (1.1.0)
     thor (0.14.6)
-    tilt (1.2.1)
-    treetop (1.4.9)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
     turn (0.8.1)
       ansi (>= 1.2.2)
-    tzinfo (0.3.23)
+    tzinfo (0.3.31)
     uuidtools (2.1.1)
     webmock (1.6.2)
       addressable (>= 2.2.2)
@@ -140,7 +138,7 @@ DEPENDENCIES
   dm-core (= 1.0.2)
   dm-migrations (= 1.0.2)
   dm-sqlite-adapter (= 1.0.2)
-  dm-sweatshop (~> 1.0.2)!
+  dm-sweatshop (~> 1.0.2)
   dm-timestamps (= 1.0.2)
   dm-types (= 1.0.2)
   dm-validations (= 1.0.2)
@@ -158,9 +156,9 @@ DEPENDENCIES
   rack (= 1.1.0)
   rack-test (= 0.5.7)
   rake (= 0.8.7)
-  randexp (~> 0.1.5)!
   redgreen (= 1.2.2)
   rr (= 1.0.2)
+  ruby-debug (= 0.10.4)
   sinatra (= 1.1.2)
   sinatra-authorization (= 1.0.0)
   sqlite3-ruby (= 1.3.2)