diff --git a/config/initializers/spring.rb b/config/initializers/spring.rb
new file mode 100644
index 0000000000000000000000000000000000000000..380f8556fc5babc73da16f7d486816b3c446fa5b
--- /dev/null
+++ b/config/initializers/spring.rb
@@ -0,0 +1,6 @@
+if Rails.env.development? || Rails.env.test?
+  Thread.abort_on_exception = false
+  Thread.send(:define_method, :abort_on_exception) do |value|
+    puts "Ignoring Thread.abort_on_exception change to #{value}"
+  end
+end
diff --git a/config/spring.rb b/config/spring.rb
new file mode 100644
index 0000000000000000000000000000000000000000..d6a88796c544e49dafa19a04ca9f9b79ab9b7878
--- /dev/null
+++ b/config/spring.rb
@@ -0,0 +1,3 @@
+Dir.glob(File.join('config', '*.yml')).each do |file|
+  Spring.watch file
+end