Added field "short_name"
Updated short_name in GeoJSON to work better with TileMill