update crafting
tweak
update combat
Basic COOK, BOIL and CONTAIN support
Added a warning message to 'blech' consumables. It warns you that the food you are trying to eat is unsafe if your cooking skill is 2 or higher.
Ties up the COOK, BOIL and CONTAIN support
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into cyborg
CHEM and BREW support
Basic hordes
SCREW and WRENCH support
Allow Escrima, Silat, and Fencing to use more weapons

Also alphabetized the allowed weapons lists and removed some weapons that didn't make sense.
Nerf Bowling Pins

24 bashing is only a little less than the medieval mace's 26 bashing, and the Bowling Pin is much lighter and therefore faster to swing. Also, official 10-pin bowling pins weigh 3 pounds 6 ounces at a minimum. I changed the bowling axe to keep around the same weight difference between the two. There's no recipe for the bowling axe, but the weight difference is approximately consistent with an added 3 scrap metals.
Allow TKD and Tai Chi manuals to spawn in dojos

Also equalized the spawn chance between all manuals.
Reduce repeats on manual spawn

Because sometimes you can find a dozen manuals all in the same dojo, and that feels silly.
Gives hairpins improvised picklock functionality.
reverting changes to itype.h
check user_dir before start
Fix segfault on start
Nerf bowling pin/axe to_hit, nerf bowling axe cut damage
DURABLE_MELEE is a flag, not a technique