Pull in latest updates from upstream

Mainly want the `chruby` stuff.