Merge branch 'develop' into staging

config/deploy.rb

@@ -153,6 +153,7 @@ desc "Deploys the current version to the server."
 task :deploy => :environment do
   queue 'export PATH=$PATH:/usr/local/rbenv/bin:/usr/local/rbenv/shims'
   deploy do
+    queue %[sudo stop sidekiq_#{user!} || true]
     # Put things that will set up an empty directory into a fully set-up
     # instance of your project.
     invoke :'git:clone'
@@ -163,6 +164,7 @@ task :deploy => :environment do
 
     to :launch do
       queue "/etc/init.d/#{user} upgrade "
+      queue! %[sudo start sidekiq_#{user!}]
 
       queue "cd #{deploy_to}/#{current_path}/"
       queue "bundle exec rake db:seed RAILS_ENV=#{rails_env}"