Put read pipe last so that eval works again. Addresses https://github.com/fish-shell/fish-shell/issues/966
Fix the build on OS X Mavericks
https://github.com/fish-shell/fish-shell/issues/968
Merge remote-tracking branch 'upstream/master'