Adding an rbenv path.
Merge branch 'master' of github.com:wangjohn/configuration_files

Conflicts:
	.bashrc