Various adjustments, removed rvm install in lieu of rbenv