Merge branch 'ssh-key' into rebuild

Conflicts:
	lib/vagrant-digitalocean/action.rb
	lib/vagrant-digitalocean/errors.rb
	locales/en.yml
Fixed syntax error due to merge.
Merge branch 'master' into rebuild
Implemented rebuild droplet command. For the given machine, the command
rebuilds an active machine with the same IP address it had.

Additionally, a new method was added to the client to wait for an
event to complete (rather than check droplet status).
resolve conflict