proper order in merlin conf syntax
set comments correctly for merlin config
Merge pull request #337 from rgrinberg/master

set comments syntax in merlin config files