Updated .vimrc and .bashrc
Merge branch 'master' of https://github.com/tliu-work/work_git