locate: finally correctly handle aliases and includes
locate: finally correctly handle aliases and includes

the-lambda-church/merlin,ocaml/merlin,ocaml/merlin,the-lambda-church/merlin,rgrinberg/merlin,chambart/merlin,chambart/merlin,fxfactorial/merlin,neojski/merlin,haselwarter/merlin,fxfactorial/merlin,fxfactorial/merlin,dra27/merlin,the-lambda-church/merlin,haselwarter/merlin,chriskonstad/merlin,neojski/merlin,chambart/merlin,neojski/merlin,fxfactorial/merlin,chambart/merlin,rgrinberg/merlin,neojski/merlin,dra27/merlin,dra27/merlin,rgrinberg/merlin,haselwarter/merlin,ocaml/merlin,chriskonstad/merlin,ocaml/merlin,dra27/merlin,rgrinberg/merlin,haselwarter/merlin