Cape Town International Jazz Festival returns, revamped