added the capistrano thing to deploy, gem only in dev, also modified the deploy files to match my server setup
added database.yml to gitignore, added capistrano bundler rvm and rails to deploy.rb and grouped capistrano gems under development group in gemfile
Merge branch 'dev'