migrating video status into video.job.status
refactored videos to have jobs. Now using Sidekiq instead of Resque
fixed merge conflict in Gemfile.lock