rvm
Merge branch 'master' of github.com:lad/dotfiles

Conflicts:
	.bashrc