Add rbenv, refactor aliases