Update dotfiles
Merged