Added capistrano bundler, re-added database.yml