Merge pull request #11 from nppangband/work_in_progress

Sync with upstream
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>
Add moria player spells

Signed-off-by: nppangband <nppangbanddev@verizon.net>
Merge pull request #14 from nppangband/work_in_progress

Work in progress
Merge pull request #15 from levind/work_in_progress

Sync Moria changes.
Merge pull request #16 from levind/bugfix

Bugfix