Append ruby version to bash prompt
Merge branch 'master' of github.com:lingceng/lingceng-config

Conflicts:
	_bash_aliases
Merge branch 'master' of github.com:lingceng/lingceng-config