diff --git a/.env b/.env
index 841285c2..3d81569c 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,3 @@
-# UCLALibrary - .env setup -- Start
 DEPLOY_HOOK=CHANGEME
 DOCKER_PORTS=80
 MAKE_WAVES=
@@ -13,4 +12,4 @@ REGISTRY_URI=uclalibrary
 SITE_URI=oralhistory-test.library.ucla.edu
 SOLR_URL=http://solr:8983/solr/blacklight-core
 TAG=dev
-TEST_DB=oral_history_test
\ No newline at end of file
+TEST_DB=oral_history_test
diff --git a/Dockerfile b/Dockerfile
index 291b2557..bda4b15b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM phusion/passenger-ruby25:1.0.11 as web
+FROM phusion/passenger-ruby25:1.0.11
 
 RUN echo 'Downloading Packages' && \
     apt-get update -qq -o Dir::Etc::sourceparts=- && \
diff --git a/bin/rails b/bin/rails
index 07396602..5badb2fd 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,4 +1,9 @@
 #!/usr/bin/env ruby
+begin
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
+end
 APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'
diff --git a/bin/rake b/bin/rake
index 17240489..d87d5f57 100755
--- a/bin/rake
+++ b/bin/rake
@@ -1,4 +1,9 @@
 #!/usr/bin/env ruby
+begin
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
+end
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 9c6e20a7..1fe79834 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -59,5 +59,5 @@
 
   # Use an evented file watcher to asynchronously detect changes in source code,
   # routes, locales, etc. This feature depends on the listen gem.
-  # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 end