Merge branch 'develop' of github.com:sebbacon/alaveteli into develop

Conflicts:
	Gemfile.lock
	script/handle-mail-replies
	script/handle-mail-replies.rb
	spec/controllers/request_controller_spec.rb

1 files changed, 2 insertions, 2 deletions

diff --git a/script/handle-mail-replies.rb b/script/handle-mail-replies.rb
index 05a934c76..eba6f44cf 100755
--- a/script/handle-mail-replies.rb
+++ b/script/handle-mail-replies.rb
@@ -166,8 +166,8 @@ def forward_on(raw_message)
 end
 
 def load_rails
-    require File.join($alaveteli_dir, 'config', 'boot')
-    require File.join(Rails.root, "config", "environment")
+    require File.join('config', 'boot')
+    require File.join('config', 'environment')
 end
 
 def record_bounce(email_address, bounce_message)