The post-apartheid struggle for an integrated Johannesburg