Update with latest from upstream

Need to make a ruby18 symlink to rbenv 1.8 version after this. (and Yosemite)