changed small error on Gemfile probably added by diff
changed user.rb a bit
Fix not being able to edit a Video's attributes

Add a migration for a missing ActiveRecord field on
the Video's model.
Generate the DelayedJobs model for a rake migration