Merge .gitconfig .vimrc .zshrc with OSX versions