Various adjustments for the deploy to staging

Conflicts:
	config/deploy/staging.rb