Merge pull request #192 from shmup/master

Dirt floors no longer considered outside.
Optimize caching the per-square is_outside data for the lightmap code, and it works this time.
Inventory: Separated medicine/drugs from food/drinks
Lawnmower blades are now generic blade items, lawnmower stuff has been
renamed to makeshift
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA
Fixed firstaid and bandages.
Add weak block to makeshift machete and broadsword
Added weak block to nailbats, forgot to include it when adding them
Added block to a few more items. Steel spear is named knife spear, is
crafted with a spike rather than a knife. Steak knives can now be
disassembled '(' for a spike.
Fixed read time being displayed when selecting perception. Normalized
amount of flammable stuff required for a molotov
Fixed error with blades in knife spears. Also added meat soup
Windows redraw fixes.
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA
Npc training talk fix
Updated credits
Merge pull request #198 from Catacstone/npc_talk_fix

Npc training talk fix
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA
Sinks no longer count as water sources
Craftable rock pots
Zombies bash curtained windows, waterskins craftable. Text overlap on
stats probably fixed.