Include dnsmasq.
Merge branch 'refactor' of github.com:poetic/our-boxen into refactor

Conflicts:
	manifests/site.pp