Improve hostname selection; favor hostname -s unless the short name is 'vps' or 'server'.