Emacs: require 'caml-types, fix #331
emacs: disable merlin-mode on type buffer
vim bugfix: global substitute option, same line rename
vim: move all buffer init into merlin#Register
vim: don't load merlin in *merlin-type-history*
vim: clear *merlin-type-history* before adding new type
vim: add g:merlin_type_history_auto_close

Force closing history window on small types
locate: add some logging
Sync to end of buffer to fix parse problem
fix compilation problem for 400 and 401
Std: add (@@) operator (not available in 4.00)
vim bugfix: autoclose type history
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)