isIpOrCidr added - checks if input is a valid IP or CIDR
move ipv4 / ipv6 to the correct set
support ipv6 addresses in config