Geotarget fixes

These commits fix some incorrect behavior with geotargeting. The first commit fixes an issue where we'd incorrectly think the metro level geotargeting needed to be updated. The second commit fixes an issue where we'd keep adding duplicate geotargets every time an ad was updated.

:eyeglasses: @atiaxi @kemitche