Fix up some missing modules and rollback dnsmasq

dnsmasq is failing on 2.0.0 due to `Could not find class dnsmasq::config`
Merge pull request #308 from articulate/fix

Fix up some missing modules and rollback dnsmasq