Merge branch 'domain_lookup'
Merge branch 'master' of https://github.com/colsond/shoal
 Fix config file and comments