Merge branch 'rewrite_update_alls' of git://github.com/stephankaag/discourse-1 into stephankaag-rewrite_update_alls

Conflicts:
	app/services/spam_rules_enforcer.rb

config/environments/development.rb

@@ -34,7 +34,15 @@ Discourse::Application.configure do
 
   # we recommend you use mailcatcher https://github.com/sj26/mailcatcher
   config.action_mailer.delivery_method = :smtp
-  config.action_mailer.smtp_settings = { address: "localhost", port: 1025 }
+   config.action_mailer.smtp_settings = {
+   :address              => "smtp.mailgun.org",
+   :port                 => 587,
+   :domain               => 'domain.com',
+   :user_name            => 'postmaster@domain.com',
+   :password             => 'secretpass',
+   :authentication       => 'plain',
+   :enable_starttls_auto => true  }
+
   config.action_mailer.raise_delivery_errors = true
 
   BetterErrors::Middleware.allow_ip! ENV['TRUSTED_IP'] if ENV['TRUSTED_IP']