Add caption options to main conf, fix wrong n1 definition in newns.conf
Merge branch 'master' of https://github.com/secure411dotorg/mal4s