Move rbenv init to zshrc from zshrc.lumosity
Only add rbenv init if rbenv exists
Merge branch 'master' of github.com:solidcell/oh-my-zsh

Conflicts:
	zshenv