also clear batches when clearing channels

Was a braino mixing the numeric channel id and the xmltv id.
Combiner: unbreak after adding cache
Merge branch 'master' of https://github.com/dekarl/nonametv
Escape the role