Updated gitconfig and added a macro in vimrc