Correction for .nz domains

Correct all of the contact mappings (.nz doesn't have a contacts:*:organisation). Correct matching of dnssec signed domains.