Update .merlin, menhirLib is no longer a dependency
Rewind lexer on (, *, ) to prevent confusion with begin/end of comments

FIXME: a more clever scheme could prove useful
Update todo