I don't think there were actually any changes in setplot.py, but I will commit this just to be sure
Fixed merge conflict
Changed KML plot region to zoomed in region