add city to plan table and nearby_plans scope to plan model
big merge