Removed rvm path from zshrc
Merge branch 'master' of github.com:Widdershin/dotfiles

Conflicts:
	zshrc