Server Autodiscovery

@shivaram1190 please review!