Clean up prompt for RVM
Merge branch 'master' of github.com:cybertoast/system_config

Conflicts:
	term/.bash_files/.ps1