Fixes broken comestibles.

Fixes bug reported here:
http://smf.cataclysmdda.com/index.php?topic=8979.0

Were these foods tested for edibility prior to being PRed?
Merge branch 'foodfix' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into food