backporting file changes into dotfiles.org