Add rvm info to prompt.
Merge branch 'master' of https://github.com/shunwen/dotfiles

Conflicts:
	bash/config
	bash/env