gitconfig: use matching instead of simple
spelling misstake in vim config
merge, use http instead of git://
Merge branch 'master' of https://github.com/sajmoon/dotfiles
exclude global gitconfig
remove conflict