move cellar warning out of pour_bottle?
remove another hack from installer