adding rvm and changing how profile is loaded
Merge branch 'master' of github.com:apexskier/dotfiles

Conflicts:
	bash/bashrc.symlink