updated gitconfig and gvimrc
Merge branch 'master' of https://github.com/hro424/config
updated gitconfig