Put user paths at beginning
Update documentation for $fish_user_paths
Merge remote-tracking branch 'upstream/master'
 update