Fixed path again so that rvm usable
Merge branch 'master' of github.com:ndland/dotfiles

Conflicts:
	zshrc
Fixed merge conflict