Fix paths for nvim target
Merge branch 'master' into grapefruit