Merge branch 'unicorn' into integration/resque_and_email_alerts