setup.py: use bytes literals The b() helper was needed because Python < 2.6 didn't support bytes literals (b''). Now that we don't support Python < 2.6, we no longer need this helper.

clonebundles: fix typo

merge: rework manifestmerge to use a matcher This opens the door to working slightly more closely with the manifest type and letting it optimize out some of the diff comparisons for us, and also makes life significantly easier for narrowhg.