Update beekeeper to resolve various username problems