Install bind packages and dnsutils for dig tests
Resolve conflicts
Merge branch 'dig_tests' of https://github.com/rallytime/salt-jenkins into dig_tests

Conflicts:
	git/salt.sls
Simpify dnsutils os_family check
Merge pull request #38 from rallytime/dig_tests

Install bind packages and dnsutils for dig tests