Add mencoder dependency
Use gina-ffmpeg package
Merge branch 'master' into add_cookbook

Conflicts:
	cookbook/Berksfile.lock
	cookbook/recipes/sidekiq.rb
Merge branch 'add_cookbook'