diff --git a/Gemfile b/Gemfile
index 960e278..1a5f008 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,9 @@ gem 'cancan', '~> 1.6.5'
 gem 'squeel', '~> 0.9.3'
 gem 'sentient_user', '~> 0.3.2'
 gem 'userstamp_basic', '~> 0.1.0'
-gem 'active_scaffold', '~> 3.1.0', :git => 'https://github.com/activescaffold/active_scaffold.git' # :path => '/home/clyfe/dev/active_scaffold'
+gem 'active_scaffold', '= 3.1.14'
+# :git => 'https://github.com/activescaffold/active_scaffold.git' 
+# :path => '/home/clyfe/dev/active_scaffold'
 gem 'pjax_rails', '~> 0.1.10'
 gem 'validates_hostname', '~> 1.0.0', :git => 'https://github.com/KimNorgaard/validates_hostname.git'
 gem 'nilify_blanks', '~> 1.0.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index d999afa..7fbf887 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,13 +4,6 @@ GIT
   specs:
     validates_hostname (1.0.0)
 
-GIT
-  remote: https://github.com/activescaffold/active_scaffold.git
-  revision: 07cfb68c2d51e4372e94322afb55262aed394211
-  specs:
-    active_scaffold (3.1.15)
-      rails (~> 3.1.0)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -31,6 +24,8 @@ GEM
     active-model-email-validator (1.0.2)
       activemodel
       mail
+    active_scaffold (3.1.14)
+      rails (~> 3.1.0)
     activemodel (3.1.1)
       activesupport (= 3.1.1)
       builder (~> 3.0.0)
@@ -87,17 +82,17 @@ GEM
     erubis (2.7.0)
     execjs (1.3.0)
       multi_json (~> 1.0)
-    factory_girl (2.4.2)
+    factory_girl (2.5.0)
       activesupport
-    factory_girl_rails (1.5.0)
-      factory_girl (~> 2.4.0)
+    factory_girl_rails (1.6.0)
+      factory_girl (~> 2.5.0)
       railties (>= 3.0.0)
     faker (1.0.1)
       i18n (~> 0.4)
     ffi (1.0.11)
     fssm (0.2.8.1)
     gem_plugin (0.2.3)
-    guard (0.10.0)
+    guard (1.0.0)
       ffi (>= 0.5.0)
       thor (~> 0.14.6)
     guard-rspec (0.4.5)
@@ -236,7 +231,7 @@ PLATFORMS
 
 DEPENDENCIES
   active-model-email-validator (~> 1.0.2)
-  active_scaffold (~> 3.1.0)!
+  active_scaffold (= 3.1.14)
   cancan (~> 1.6.5)
   capistrano (~> 2.9.0)
   capybara (~> 1.1.1)