Bottler/Unbotter, fixes to potion items.

Bottler and Unbottler are done except for textures and recipes.

Potion item fixes are related to drinking and what  happens to the empty
bottle. They should now mimic vanilla bottles.