Forage fixes.
Merge branch 'master' into balance
Merge branch 'balance' of file:///home/user/git/Cataclysm-DDA/ into balance
Tweaks
No food on ground
Better differentiates between the light and lightest survivor pack options.
Powdered antiseptic.

This is to disinfectant as hemostatic powder is to bandages.
Fixing the derp.
Merge branch 'antiseptic-powder' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into merge
Merge branch 'harness-differentiation' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into merge
Fix
Merge branch 'seasonal_forage' of https://github.com/Reaper42/Cataclysm-DDA into merge
revert formula change

Number-based balance shift ought to go in a separate PR.  Sorry.
Merge branch 'more-monster-on-death-corrections' of https://github.com/BevapDin/Cataclysm-DDA into merge
Voids unused option

Lets Windows folks compile.
Hate it when I do that

Anded rather than Ored.  No big deal, we've all made this kind of
mistake.
Merge branch 'merge'