updated gemfile to deploy with capistrano
more capistrano stuff
fixed merge conflict