update .bashrc and .bash_profile
update emacs and bash dot files
Merge branch 'master' of https://github.com/xiejunyi/dotfiles

Conflicts:
	.bashrc
	bash/.bash_profile