Add .rvmrc to gitignore
Merge branch 'master' of github.com:jclem/dotfiles

Conflicts:
	git/gitignore_global.symlink