get rid of rvm for now (never use it)
Merge branch 'master' of github.com:jzawodn/dotfiles

Conflicts:
	.bashrc