updates to dotfiles
merging