locate: Use fallback in more cases
locate: finally correctly handle aliases and includes
locate: Add some debug printing (to be safe)
locate: Better handling of paths
locate: backported patches from master and reactivated