Shortened some of the command names, since it looks like a clump of letters in a 80x24 terminal
allows tool belts to be used as armor
Merge remote-tracking branches 'dda/pr/8982' and 'dda/pr/8994' into dda-master

* dda/pr/8982:
  Shortened some of the command names, since it looks like a clump of letters in a 80x24 terminal

* dda/pr/8994:
  allows tool belts to be used as armor