Updates dotfiles
merges master