Fix whois for whois-{ip,domain} split
Use , instead of 'and' for script selection
whois-domain has too much output
Merge branch 'deploy'