sshfs 2.4.1, and switch to osxfuse
Merge remote-tracking branch 'upstream/master'