Sort servers.json
Update servers.json
Fix WHOIS command for Donuts servers
Update tests