Stop insisting on trying to add /usr/bin and /bin to $PATH.
https://github.com/fish-shell/fish-shell/pull/854
Add a fancy new paths_are_equivalent function to test for equivalent
paths instead of merely equal ones
Merge remote-tracking branch 'upstream/master'