Add support for a more general branch naming scheme