add support for rvm and rbenv
Merge branch 'master' of https://github.com/arcin/dotfiles

Conflicts:
	zshrc