right/tag cleanup, plus mailer cleanup
Merge branch 'simple_stuff' into action_events