No more rvm; #chruby4life
Merge branch 'master' of github.com:jhottenstein/HomeDir

Conflicts:
	.bashrc