diff --git a/Gemfile b/Gemfile
index 2738056d6..00fb92d3e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -130,12 +130,28 @@ group :development, :test do
   # for security audit'
   gem 'brakeman', '~> 2.6.2', require: false
 
+  # bundle exec rake doc:rails generates the API under doc/api.
+  gem 'sdoc', '~> 0.4.0'
+
+  # faster dev load time
+  gem 'unicorn'
+end
+
+group :development do
   # Spring speeds up development by keeping your application running in the background.
   # Read more: https://github.com/rails/spring
   gem 'spring', '~> 1.2.0'
+  gem 'spring-commands-rspec', '~> 1.0.2'
 
-  # bundle exec rake doc:rails generates the API under doc/api.
-  gem 'sdoc', '~> 0.4.0'
+  # for fast deployment
+  gem 'mina', '~> 0.3.1'
+
+  # for finding dead routes and unused actions
+  gem 'traceroute', '~> 0.4.0'
+
+  # for improved errors
+  gem 'better_errors', '~> 2.0.0'
+  gem 'binding_of_caller', '~> 0.7.2'
 
   # run tests automatically
   gem 'guard', '~> 2.6.1'
@@ -144,16 +160,4 @@ group :development, :test do
   gem 'guard-rspec', '~> 4.3.1'
   gem 'rubocop', '~> 0.26.1'
   gem 'guard-rubocop', '~> 1.1.0'
-
-  # for quick debugging
-  gem 'web-console', '~> 2.0.0.beta4'
-
-  # for finding dead routes and unused actions
-  gem 'traceroute', '~> 0.4.0'
-
-  # faster dev load time
-  gem 'unicorn'
-
-  # for fast deployment
-  gem 'mina', '~> 0.3.1'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index c3132945d..3175db835 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,6 +38,10 @@ GEM
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
     bcrypt (3.1.7)
+    better_errors (2.0.0)
+      coderay (>= 1.0.0)
+      erubis (>= 2.6.6)
+      rack (>= 0.9.0)
     binding_of_caller (0.7.3.pre1)
       debug_inspector (>= 0.0.1)
     bootstrap-sass (3.2.0.2)
@@ -306,6 +310,8 @@ GEM
       tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
     spring (1.2.0)
+    spring-commands-rspec (1.0.2)
+      spring (>= 0.9.1)
     sprockets (2.8.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -352,11 +358,6 @@ GEM
       equalizer (~> 0.0, >= 0.0.9)
     warden (1.2.3)
       rack (>= 1.0)
-    web-console (2.0.0.beta4)
-      activemodel (~> 4.0)
-      binding_of_caller (= 0.7.3.pre1)
-      railties (~> 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
     websocket-driver (0.3.5)
     whenever (0.9.4)
       chronic (>= 0.6.3)
@@ -368,6 +369,8 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-import (~> 0.6.0)
+  better_errors (~> 2.0.0)
+  binding_of_caller (~> 0.7.2)
   bootstrap-sass (~> 3.2.0.1)
   brakeman (~> 2.6.2)
   bullet (~> 4.14.0)
@@ -413,11 +416,11 @@ DEPENDENCIES
   simplecov (~> 0.9.1)
   simpleidn (~> 0.0.5)
   spring (~> 1.2.0)
+  spring-commands-rspec (~> 1.0.2)
   therubyracer
   traceroute (~> 0.4.0)
   turbolinks
   uglifier (>= 1.3.0)
   unicorn
   uuidtools (~> 2.1.4)
-  web-console (~> 2.0.0.beta4)
   whenever (~> 0.9.4)
diff --git a/config/deploy.rb b/config/deploy.rb
index b56205c06..a7ae1fe1d 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -91,8 +91,6 @@ task deploy: :environment do
 
     to :launch do
       queue "mkdir -p #{deploy_to}/current/tmp; touch #{deploy_to}/current/tmp/restart.txt"
-      #queue 'RAILS_ENV=production bin/delayed_job stop'
-      #queue 'RAILS_ENV=production bin/delayed_job start'
     end
   end
 end
diff --git a/config/initializers/initial_settings.rb b/config/initializers/initial_settings.rb
index 05f2a9863..7a00d673c 100644
--- a/config/initializers/initial_settings.rb
+++ b/config/initializers/initial_settings.rb
@@ -1,7 +1,9 @@
-Setting.disclosure_name = true if Setting.disclosure_name.nil?
-Setting.disclosure_name = true if Setting.disclosure_name.nil?
-Setting.disclosure_org_name = true if Setting.disclosure_org_name.nil?
-Setting.disclosure_email = true if Setting.disclosure_email.nil?
-Setting.disclosure_phone = false if Setting.disclosure_phone.nil?
-Setting.disclosure_fax = false if Setting.disclosure_fax.nil?
-Setting.disclosure_address = false if Setting.disclosure_address.nil?
+if ActiveRecord::Base.connection.table_exists? 'settings' # otherwise rake not working 100%
+  Setting.disclosure_name = true if Setting.disclosure_name.nil?
+  Setting.disclosure_name = true if Setting.disclosure_name.nil?
+  Setting.disclosure_org_name = true if Setting.disclosure_org_name.nil?
+  Setting.disclosure_email = true if Setting.disclosure_email.nil?
+  Setting.disclosure_phone = false if Setting.disclosure_phone.nil?
+  Setting.disclosure_fax = false if Setting.disclosure_fax.nil?
+  Setting.disclosure_address = false if Setting.disclosure_address.nil?
+end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 338fa88d6..9ebf88da9 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -5,6 +5,7 @@ require File.expand_path('../../config/environment', __FILE__)
 require 'rspec/rails'
 require 'shoulda/matchers'
 require 'capybara/poltergeist'
+require 'paper_trail/frameworks/rspec'
 
 if ENV['ROBOT']
   require 'simplecov'