[shell_config] Change TERM to xterm so that after vim exits, its buffer is cleared
Modify vimrc
Merge origin/master