Reset "typing" to ocaml-4.00.1+short-types
Apply merlin patches to typer (strict)
Apply lazy merlin patches to typer
Remove (!:) operator from Misc (unused, potentially confusing)
Reintroduce support for "nonrec"
Reset "parsing" to ocaml-4.00.1+short-types
Apply merlin patches to "parsing" directory