emacs: added kind for auto-completion.
emacs: don't retract on errors
vim: warnings hl in syntastic can be disabled
Merge 'experimental' into 'master'

Conflicts:
	vim/autoload/merlin.vim