locate: better handling of local aliases (fix #623)
locate: better handling of local aliases (fix #623)

rgrinberg/merlin,dra27/merlin,the-lambda-church/merlin,ocaml/merlin,dra27/merlin,the-lambda-church/merlin,the-lambda-church/merlin,dra27/merlin,rgrinberg/merlin,ocaml/merlin,ocaml/merlin,rgrinberg/merlin,rgrinberg/merlin,ocaml/merlin,dra27/merlin