correctly exclude gradle working directories, edit backup files, and remove old zip out of the way after building twice
merge