change to rbenv
Merge branch 'master' of github.com:halftan/dotfiles

Conflicts:
	.zshrc
Merge branch 'master' of github.com:halftan/dotfiles

Conflicts:
	.zshrc
Merge branch 'master' of github.com:halftan/dotfiles
Merge branch 'master' of github.com:halftan/dotfiles