Merge pull request #142 from greboid/master

In theory make DNS plugin work with IPv6.
Tidy up AliasManagerLinker.