Merge pull request #215 from gsg/fix-type-enclosing

emacs: fix merlin-type-enclosing temporary keymap
WIP Fix guide selection in recovery
Still tweaking recovery :'
Added a TODO on the types of modules.
emacs: company mode support.
Error on failing to find a location
Define merlin-company-cache as defvar

Avoids byte-compilation warnings.
Fix wrong variable use