Gizzard-isolation

Prunes out some over-reliance on the existing rotten-food code, and
hopefully prevents rogue mods elsewhere.
Merge to mainline

Conflicts:
	src/player.cpp
Hopefully fix the clang compiler warning