Prevents using label command if it's grayed out
Adds everything I've been workming on and fighting to make github accept properly for the past couple of hours
Remove any benefits of eating meat if you're a herbivore. Fixes #8790.
Merge branch 'relabel-fix' of https://github.com/EpicOrange/Cataclysm-DDA into merge
JSON format issues

Nothing terribly difficult.
Merge branch 'cows-hate-meat' of https://github.com/kevingranade/Cataclysm-DDA into merge
Merge remote-tracking branch 'upstream/master'