Lots of changes, mostly switching back to rbenv