fixes to borough_name, city templates
add borough name as county in hierarchical geographic
regenerated mods