Recategorization of waterskin and stone knife

Moves waterskin to Other -> Containers and stone knife to Other -> Tools.
Merge pull request #5234 from MisterFelixFox/tiny-recategorize

Recategorization of waterskin and stone knife