wood spear → wooden spear

I derped and didn't save melee.json before submitting the last change, sorry. This should complete the transition.
Added recipe for ankle holster

Half the cost of a holster or sheath and requires survival rather than
cutting or pistol. This seemed sensible as it's a small utility
holster that can hold either a small knife or a small pistol
Made BELTED foot items not count as shoes

This means you can wear an ankle holster at the same time as footwear,
as otherwise BELTED wouldn't do anything on a foot slot.

It also means that now if you're running around wearing nothing on
your feet but socks and an ankle holster you get the "no shoes"
movement penalty.
Fixes ethanol burner crash
On hack fail, only shutdown computers next to player
Merge pull request #7870 from reverieAlice/wood_spear_derp

wood spear → wooden spear
Mainly for farming, show plantname when examining a square fo terrain.
Merge branch 'ethanol_burner_fix' of https://github.com/reverieAlice/Cataclysm-DDA into merge
Merge branch 'bootstrapping-bootstraps' of https://github.com/rluddy/Cataclysm-DDA into merge
Merge branch 'fix-computer-shutdown' of https://github.com/vidarsk/Cataclysm-DDA into merge
Fix typo

I think the speed's OK, but the syntax was missing something.  ;-)
Merge pull request #7878 from jeremyosborne/plant_names

Show plant names when x-amining the terrain
Merge pull request #7879 from KA101/centipede

Fix typo