Upgrade Capistrano to ~> 3.0
initial commit of the default Capistrano 3 config
Set application name and repo URL
Uncomment command to restart Passenger
Enable bundle/Rails assets/migrations support in Capfile
Set deploy_to to /var/sites/[application name]
Updated gems
Defer evaluation of deploy_to and set the application name for staging
Symlink secret_token.rb during deploy
Set rails_env to production
Use current user to deploy, set server to deploy to
Updated gems
Merge branch 'master' into displays

Conflicts:
	Gemfile.lock