Update dotfiles
Merge #aee11d1