update dotfiles
merge master