Updated to Martin's dotfiles.