Be able to add entries to /etc/hosts
Be able to remove entries from /etc/hosts
Merge branch 'develop' of https://github.com/saltstack/salt into dnsmasq
Fixing weird merge conflict