Remove lockstep
Add user-wide .gitconfig