update .gitconfig
update .vimrc
Merge pull request #3 from ryanduan/master

update .gitconfig