change the host name to 'ocean1' in deploy/production.rb
Merge branch 'master' of https://github.com/chadcodes/digital_ocean_cap_deploy

Conflicts:
	config/deploy/production.rb
Merge branch 'master' of https://github.com/chadcodes/digital_ocean_cap_deploy