Fix final unwatch on the wrong connection.
Add extra wait to make sure we get hostnames.
Add some retry logic for retrieving host names and retrying ssh connection.
Guide for testing grid on amazon