Tidying, puppet-lint and removing dnsmasq requirements