merge osx & win dotfiles