config file changes
Merge branch 'master' of github.com:fygrave/dnslyzer

Conflicts:
	distributed/dnsdexer.cfg