backport converge script changes to dotfiles.org