Error on failing to find a location
Define merlin-company-cache as defvar

Avoids byte-compilation warnings.
Fix wrong variable use
Merge pull request #216 from gsg/fix-minor-bugs

Fix minor bugs