background jobs, sidekiq, redis, mailer, oauth needs a little work
fixed merge conflict