fixes & test updates for domain/searchpath being mutually exclusive
fixes & test updates for domain/searchpath being mutually exclusive
Merge branch 'domainname_real' of https://github.com/jewjitsu/puppet-resolv_conf into jewjitsu-domainname_real

Conflicts:
	manifests/init.pp
Merge branch 'jewjitsu-domainname_real'