Updated script to use rbenv, plus cleanup