Moria changes - part 1

Signed-off-by: nppangband <nppangbanddev@verizon.net>
Merge branch 'work_in_progress' of https://github.com/nppangband/NPPAngband into moria_changes


Signed-off-by: nppangband <nppangbanddev@verizon.net>