Put these classes back into the models

I don't understand really how this works
yank passenger as a requirement in the Gemfile
Fix the repeated capistrano reference
pretty errors
various gem manipulations
go ruby 2.1.1 in this branch