begin ocamllex rules and define tokens in parser.mli
Merge Martin Local & remote
Re-merge Martin Local & remote