update .gitconfig, .vimrc
Merge branch 'master' of https://github.com/bis5/dotfiles
update .vimrc