Change git config upstream
Merge
Update dotvim
Trying to resolve annoying gitconfig conflict that breaks git
Merge branch 'master' of github.com:paulwib/dotphiles