diff --git a/Gemfile b/Gemfile
index 55086cc65..a0effe65a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,28 +2,13 @@ source 'https://rubygems.org/'
 
 gem 'dotenv-rails', :require => "dotenv/rails-now"
 
-group :test do
-  gem "shoulda-context"
-  gem "shoulda-matchers"
-  gem "factory_girl"
-  gem "mocha", :require => "mocha/setup"
-  gem "ffaker"
-  gem "simplecov", :require => false
-  gem "timecop"
-  gem "fakeweb"
-end
-
 gem 'protected_attributes'
-gem "sass-rails", "~> 4.0.0"
+gem "sass-rails"
 gem "sprockets-rails", :require => "sprockets/railtie"
 gem "uglifier"
-gem 'coffee-rails'
 gem "therubyracer", :platforms => :ruby
-gem "pry", :group => [:test, :development]
-gem "byebug", :group => [:test, :development]
 gem "rails", "~> 4.2.0"
 gem "pg"
-gem "kgio", :platforms => :ruby
 gem "dalli", :platforms => :ruby
 gem "memcache-client", :platforms => [:mswin, :mingw, :x64_mingw]
 gem "tzinfo-data", :platforms => [:mswin, :mingw, :x64_mingw]
@@ -31,17 +16,13 @@ gem "delayed_job"
 gem "delayed_job_active_record"
 gem "simple_form"
 gem "mechanize"
-gem "nokogiri"
 gem "whenever", :require => false
 gem "sanitize", "~> 3.1.0"
 gem 'rmagick'
-gem 'daemons'
-gem 'net-ssh'
 gem 'net-sftp'
 gem 'term-ansicolor', :require => "term/ansicolor"
 gem 'diff-lcs', :require => "diff/lcs/array", :git => "https://github.com/halostatue/diff-lcs.git"
 gem 'bcrypt-ruby', :require => "bcrypt"
-gem 'awesome_print'
 gem 'statistics2'
 gem 'capistrano', '~> 3.4.0'
 gem 'capistrano-rails'
@@ -76,7 +57,19 @@ group :production do
   gem 'capistrano-deploytags', '~> 1.0.0', require: false
 end
 
-group :development do
+group :development, :test do
+  gem 'awesome_print'
+  gem 'pry-byebug'
   gem 'ruby-prof'
-  # gem 'sql-logging'
+end
+
+group :test do
+  gem "shoulda-context"
+  gem "shoulda-matchers"
+  gem "factory_girl"
+  gem "mocha", :require => "mocha/setup"
+  gem "ffaker"
+  gem "simplecov", :require => false
+  gem "timecop"
+  gem "fakeweb"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 43adde65e..5fda99bab 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -30,45 +30,44 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
+    actionmailer (4.2.8)
+      actionpack (= 4.2.8)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.7.1)
-      actionview (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    actionpack (4.2.8)
+      actionview (= 4.2.8)
+      activesupport (= 4.2.8)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.7.1)
-      activesupport (= 4.2.7.1)
+    actionview (4.2.8)
+      activesupport (= 4.2.8)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.7.1)
-      activesupport (= 4.2.7.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.8)
+      activesupport (= 4.2.8)
       globalid (>= 0.3.0)
-    activemodel (4.2.7.1)
-      activesupport (= 4.2.7.1)
+    activemodel (4.2.8)
+      activesupport (= 4.2.8)
       builder (~> 3.1)
-    activerecord (4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    activerecord (4.2.8)
+      activemodel (= 4.2.8)
+      activesupport (= 4.2.8)
       arel (~> 6.0)
-    activesupport (4.2.7.1)
+    activesupport (4.2.8)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
-    arel (6.0.3)
-    awesome_print (1.6.1)
+    arel (6.0.4)
+    awesome_print (1.7.0)
     aws-sdk (2.7.4)
       aws-sdk-resources (= 2.7.4)
     aws-sdk-core (2.7.4)
@@ -106,22 +105,14 @@ GEM
     chronic (0.10.2)
     cityhash (0.8.1)
     coderay (1.1.1)
-    coffee-rails (4.1.0)
-      coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.9.1.1)
     colorize (0.7.7)
     crass (1.0.2)
-    daemons (1.2.3)
-    dalli (2.7.4)
-    delayed_job (4.0.6)
-      activesupport (>= 3.0, < 5.0)
-    delayed_job_active_record (4.0.3)
-      activerecord (>= 3.0, < 5.0)
-      delayed_job (>= 3.0, < 4.1)
+    dalli (2.7.6)
+    delayed_job (4.1.2)
+      activesupport (>= 3.0, < 5.1)
+    delayed_job_active_record (4.1.1)
+      activerecord (>= 3.0, < 5.1)
+      delayed_job (>= 3.0, < 5)
     docile (1.1.5)
     domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
@@ -131,13 +122,13 @@ GEM
       railties (>= 3.2, < 5.1)
     equalizer (0.0.11)
     erubis (2.7.0)
-    execjs (2.6.0)
+    execjs (2.7.0)
     factory_girl (4.8.0)
       activesupport (>= 3.0.0)
     fakeweb (1.3.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffaker (2.4.0)
+    ffaker (2.5.0)
     ffi (1.9.10-x64-mingw32)
     gctools (0.2.4)
     get_process_mem (0.2.1)
@@ -170,7 +161,7 @@ GEM
     http_parser.rb (0.6.0)
     httpclient (2.8.0)
     hurley (0.2)
-    i18n (0.8.0)
+    i18n (0.8.1)
     jmespath (1.3.1)
     json (1.8.6)
     jwt (1.5.6)
@@ -184,13 +175,13 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
-    mechanize (2.7.3)
+    mechanize (2.7.5)
       domain_name (~> 0.5, >= 0.5.1)
       http-cookie (~> 1.0)
-      mime-types (~> 2.0)
+      mime-types (>= 1.17.2)
       net-http-digest_auth (~> 1.1, >= 1.1.1)
       net-http-persistent (~> 2.5, >= 2.5.2)
-      nokogiri (~> 1.4)
+      nokogiri (~> 1.6)
       ntlm-http (~> 0.1, >= 0.1.1)
       webrobots (>= 0.0.9, < 0.2)
     memcache-client (1.8.5)
@@ -208,7 +199,7 @@ GEM
     multi_json (1.12.1)
     multipart-post (2.0.0)
     naught (1.0.0)
-    net-http-digest_auth (1.4)
+    net-http-digest_auth (1.4.1)
     net-http-persistent (2.9.4)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -217,49 +208,52 @@ GEM
     net-ssh (2.9.2)
     netrc (0.10.3)
     newrelic_rpm (3.13.0.299)
-    nokogiri (1.6.8.1)
+    nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
-    nokogiri (1.6.8.1-x64-mingw32)
+    nokogiri (1.7.0.1-x64-mingw32)
       mini_portile2 (~> 2.1.0)
     nokogumbo (1.2.0)
       nokogiri
     ntlm-http (0.1.1)
     os (0.9.6)
-    pg (0.18.2)
-    pg (0.18.2-x64-mingw32)
+    pg (0.19.0)
+    pg (0.19.0-x64-mingw32)
     protected_attributes (1.1.3)
       activemodel (>= 4.0.1, < 5.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    pry-byebug (3.4.2)
+      byebug (~> 9.0)
+      pry (~> 0.10)
     public_suffix (2.0.5)
     rack (1.6.5)
     rack-test (0.6.3)
       rack (>= 1.0)
     radix62 (1.0.1)
-    rails (4.2.7.1)
-      actionmailer (= 4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activerecord (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    rails (4.2.8)
+      actionmailer (= 4.2.8)
+      actionpack (= 4.2.8)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
+      activemodel (= 4.2.8)
+      activerecord (= 4.2.8)
+      activesupport (= 4.2.8)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.7.1)
+      railties (= 4.2.8)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
+    rails-dom-testing (1.0.8)
       activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    railties (4.2.8)
+      actionpack (= 4.2.8)
+      activesupport (= 4.2.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.17.0)
@@ -267,8 +261,8 @@ GEM
     ref (2.0.0)
     representable (2.3.0)
       uber (~> 0.0.7)
-    responders (2.1.0)
-      railties (>= 4.2.0, < 5)
+    responders (2.3.0)
+      railties (>= 4.2.0, < 5.1)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
@@ -279,19 +273,20 @@ GEM
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     retriable (2.1.0)
-    rmagick (2.15.4)
+    rmagick (2.16.0)
     ruby-prof (0.15.8)
     rubyzip (1.1.7)
     sanitize (3.1.2)
       crass (~> 1.0.1)
       nokogiri (>= 1.4.4)
       nokogumbo (= 1.2.0)
-    sass (3.2.19)
-    sass-rails (4.0.5)
-      railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.2)
-      sprockets (~> 2.8, < 3.0)
-      sprockets-rails (~> 2.0)
+    sass (3.4.23)
+    sass-rails (5.0.6)
+      railties (>= 4.0.0, < 6)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
     shoulda-context (1.2.2)
     shoulda-matchers (3.1.1)
       activesupport (>= 4.0.0)
@@ -300,7 +295,7 @@ GEM
       faraday (~> 0.9)
       jwt (~> 1.5)
       multi_json (~> 1.10)
-    simple_form (3.3.1)
+    simple_form (3.4.0)
       actionpack (> 4, < 5.1)
       activemodel (> 4, < 5.1)
     simple_oauth (0.3.1)
@@ -333,8 +328,8 @@ GEM
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
-    thor (0.19.1)
-    thread_safe (0.3.5)
+    thor (0.19.4)
+    thread_safe (0.3.6)
     tilt (1.4.1)
     timecop (0.8.1)
     tins (1.6.0)
@@ -354,9 +349,8 @@ GEM
     tzinfo-data (1.2015.6)
       tzinfo (>= 1.0.0)
     uber (0.0.15)
-    uglifier (2.7.1)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
+    uglifier (3.0.4)
+      execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.1)
@@ -367,8 +361,8 @@ GEM
     unicorn-worker-killer (0.4.4)
       get_process_mem (~> 0)
       unicorn (>= 4, < 6)
-    webrobots (0.1.1)
-    whenever (0.9.4)
+    webrobots (0.1.2)
+    whenever (0.9.7)
       chronic (>= 0.6.3)
 
 PLATFORMS
@@ -380,15 +374,12 @@ DEPENDENCIES
   aws-sdk (~> 2)
   bcrypt-ruby
   bigquery!
-  byebug
   capistrano (~> 3.4.0)
   capistrano-deploytags (~> 1.0.0)
   capistrano-rails
   capistrano-rbenv
   capistrano3-unicorn
   cityhash
-  coffee-rails
-  daemons
   dalli
   delayed_job
   delayed_job_active_record
@@ -401,19 +392,16 @@ DEPENDENCIES
   gctools
   google-api-client
   highline
-  kgio
   mechanize
   memcache-client
   memcache_mock
   memoist
   mocha
   net-sftp
-  net-ssh
   newrelic_rpm
-  nokogiri
   pg
   protected_attributes
-  pry
+  pry-byebug
   radix62 (~> 1.0.1)
   rails (~> 4.2.0)
   responders
@@ -422,7 +410,7 @@ DEPENDENCIES
   ruby-prof
   rubyzip
   sanitize (~> 3.1.0)
-  sass-rails (~> 4.0.0)
+  sass-rails
   shoulda-context
   shoulda-matchers
   simple_form