On add_to_etc_host, edit /etc/hosts once rather than twice
Merge branch 'atomic_etc_hosts_add' into vanilla_improvements