some settings
some settings
Merge branch 'deploy'

Conflicts:
	Capfile
	config/deploy.rb
	config/deploy/production.rb
	config/deploy/staging.rb
d