Made lots of improvements to equiment and inventory:

- Equipment, not the component (should rename one), is now a simpler
(see flatter) map with the use of merge-with & assoc.
- Because of the above, getting the name is a lot simpler, instead of
concatenating the names.
- Renamed a lot of things that should have c-* instead of *-comp.
- Equipment, the component, now contains :armor and :weapon.
- Added a tunic to double check armor/max-hp stuff works properly.