I would second the vote on the Apartheid museum and if you are staying overnight in Jo-burg I can highly recommend a guest house called Mo's Place. It is relatively new and is run by two super-friendly lesbians. The rooms are spacious and very clean. I felt at home right away. Their email address is [email protected]. I head to Cape Town tomorrow and will post again if I find something particularly worthwhile recommending there.