Less scala madness in Vim. Fix cider + adoc-mode in Emacs