added dnsmasq.template, misc changes in init.pp