Black Bean Soup (and a variation)