export rvm binaries dir
Merge branch 'master' of github.com:peutipoix/dotfiles

Conflicts:
	dotfiles/.bashrc