update config/deploy.rb to point to droplet
merge changes