Adds potion meta
Some cleanup as well
Merge branch '2.9' of https://github.com/essentials/Essentials into 2.9