Merge branch 'master' into openstreetbugs

Conflicts:
	config/routes.rb
	db/structure.sql

app/models/spam_observer.rb

@@ -9,7 +9,7 @@ class SpamObserver < ActiveRecord::Observer
     end
 
     if user.status == "active" and user.spam_score > SPAM_THRESHOLD
-      user.update_attributes(:status => "suspended")
+      user.update_column(:status, "suspended")
     end
   end
 end

app/models/trace_sweeper.rb

@@ -16,7 +16,6 @@ class TraceSweeper < ActionController::Caching::Sweeper
 private
 
   def expire_cache_for(record)
-    expire_action(:controller => 'trace', :action => 'view', :id => record.id)
     expire_action(:controller => 'trace', :action => 'view', :display_name => record.user.display_name, :id => record.id)
 
     expire_action(:controller => 'trace', :action => 'list', :display_name => nil, :tag => nil)

app/models/user_sweeper.rb

@@ -34,7 +34,6 @@ private
       expire_action(:controller => 'diary_entry', :action => 'rss', :format => :rss, :language => nil, :display_name => old_record.display_name)
 
       old_record.traces.each do |trace|
-        expire_action(:controller => 'trace', :action => 'view', :id => trace.id)
         expire_action(:controller => 'trace', :action => 'view', :display_name => old_record.display_name, :id => trace.id)
 
         trace.tags.each do |tag|