backports changes into dotfiles.org