Added a city/locality class and included it in the necessary attributes
Dropped AsgNum from the nonmatch non-name training data logic