Add instance-id awareness to get_hostnames()

 - also move the EC2 "check" to util since it's not really a check at all