update .merlin

* keep up with the cohttp -> lib rename
* add cmdliner
simplify expression in bin/lwt_server
Merge pull request #216 from rgrinberg/merlin_update

Merlin update