change default nsd config location to /etc/nsd.tcl
test commit
undo test commit
Merge branch 'development' of github.com:qcode-software/muppet into development
Merge remote branch 'origin/master' into development