[zsh] rvm settings
Merge branch 'master' of github.com:ndrzmansn/dotfiles

Conflicts:
	zshrc