Move merge_updates_windows.bat to right folder and add Unix version