Some name changes to veggy chunks
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA
Changed messenger bag description and storage
Added wild veggies to various recipes
Increased chance of gas pumps running out of gas
Fixed a screwup in cooked marrow description.
Added numpad keys to input.cpp

Conflicts:

	overmap.cpp
Added missing key for numpad support
Fixed unburied landmines being placed in mx_minefield
Remove DOS style newlines.
Make wolves and other meat-eaters unhappy about zombie meat, but ok with cooked and human meat.
Merge pull request #130 from OzoneH3/master

Added Option (safemodeproximity) for safemode, at what distance to hostiles safemode should kick in
Makefile update
Fema groundsheets are now indoor tiles. The labs no longer use pavement.
Merge pull request #144 from OzoneH3/master

Updated inventory menu to always display item info and a menu beside
s/percussion/concussion in bike helmet description.

Thanks to elricsfate for pointing it out.
giving 'tough' trait a cost of 3 pts instead of 5
mingw & fake curses compilation fix
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA
Added magacine for archery, added guns and ammo to magazine group