Locker and display rack construction
Altered mapdata.h for decon-tag to locker & rack
Fix so lockers and racks turn into t_floor
Change default wait key to "_"

IMO, it's silly to have the default wait key be one key away from the default craft key - makes it too easy to accidentally wait when you meant to craft. Especially given that you need to press "7" to exit the menu.
Allow esc to exit from menu() and menu_vec() (e.g., wait, use knife, etc.)
Added handling of iuse functionality to the item factory. Made mapgen code go through item factory to get templates, so json file entries are actually used here.
Use | instead for the default wait key - doesn't conflict with anything this time
Merge remote-tracking branch 'dda/pr/540' into dda-master
Merge remote-tracking branch 'dda/pr/541' into dda-master
Merge remote-tracking branch 'dda/pr/543' into dda-master