WTH, TRYING TO GET RID OF MY PASWORD IN THIS FILE... Ignoring some stuff.
Merge branch 'master' of github.com:joshgordon/dns-dhcp-config