Adjusted deploy config for new staging server
Adjusted deploy config for new staging server

Conflicts:
	config/deploy/staging-old.rb

CoolestNerdIII/elmo,VIP-eDemocracy/elmo,CoolestNerdIII/elmo,VIP-eDemocracy/elmo,VIP-eDemocracy/elmo,CoolestNerdIII/elmo