Update dotfiles
Merge up with remote