options: [-vnum] prints the same information as [-version]
Synchronized typing/ with ocaml-trunk
Synchronized parsing with ocaml-trunk
(Partially) Synchronized utils with ocaml-trunk
Patch type-checker for merlin
Port parser from ocaml-trunk
Fix integration with new parser and type-checker
Update original ocaml source code
Synchronized magic_numbers
Fix grammar and error reporting in Chunk_parser
A few fixes after rebase on master
Update base ocaml 4.01-trunk

From trunk
        commit cdd43f280062f7d6693eabec6439623ccece6030
        Author: Gabriel Scherer <gabriel.scherer@gmail.com>
        Date:   Sun Jul 21 20:03:52 2013 +0000
To 4.01
        commit 572183501ab011fc6c03e35db8c1fea82214ba13
        Author: Gabriel Scherer <gabriel.scherer@gmail.com>
        Date:   Tue Aug 20 16:02:58 2013 +0000
Fix Typetexp