resolve location

remove replace city and greater_area columns in events with location_id
remoce state and country from locations and replace with greater_area because not all data sources differentiate the two for now eg pitchfork doesnt give tagged info and we can only pull out info via complicated regex