modify .vimrc
Merge branch 'master' of https://github.com/XinSong/vi_config
modify .my_bashrc