vim: support for locating results in a new or existing tab
Merge pull request #335 from cyberhuman/master

vim: support for locating results in a new or existing tab
proper order in merlin conf syntax
set comments correctly for merlin config
Revert "vim: add g:merlin_type_history_auto_close"

This reverts commit 68725ecd2e3b22352f7c9dbbe3151f603f895694.
vim: fix [merlin-type-history] clearing

Ugly ugly.
Merge pull request #337 from rgrinberg/master

set comments syntax in merlin config files
Redirect stderr with sexp protocol (fix #333)
Merlin_lexer: signal EOF even if lexer ended up failing
Add explicit constraint to custom_printf (fix #307)
vim: use buffer encoding to interpret content
Simplify incremental parsing interface

Functional proof of concept, more code can be dropped
Remove dead code from merlin_parser
Simplify type checker
Merlin_typer: with_typer no longer capture errors

Use protect_typer to capture errors. This fix a regression introduced
during typer simplification.
Command: uniformize use of (@@)

When it decreases indentation :P
Type_utils: make type expansion recursive
Typing_aux: add uncatch_errors to reenable type errors locally
Type_utils: detect type errors and fallback to other cases