Add modified version of cd completion to work around
https://github.com/fish-shell/fish-shell/issues/562