The controversy-magnet returns to Edinburgh from what he calls ‘comedy jail’, sparked by a row over anti-Semitism ...