Merged .gitconfig from master