Some changes to avoid git config problems when updating dotfiles