Refactor bash prompt and alias
Merge branch 'master' of http://github.com/fudanchii/myconf

Conflicts:
	.bashrc