Fix .gitconfig and .vimrc

Remove some entries from .gitconfig
Fix some entries and convert tab to space on .vimrc
Add include directive to .gitconfig