Merge branch 'master' of github.com:gunyarakun/dotfiles
From rvm to rbenv