changed comments about nmssmtools flags for clarity as discused with Ben.
fixed merge conflict in manual.