Correct all of the contact mappings (.nz doesn't have a contacts:*:organisation). Correct matching of dnssec signed domains.
Merge pull request #10 from mrtimp/master

removed tailing spaces + fixed .nz whois handling.