Import recent changes relating to fish from rbenv
Merge branch 'improved-fish-support'