random updates
merge .gitconfig