Taming the Disorderly City: The Spatial Landscape of Johannesburg after Apartheid