Final NPP 6.1.1

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

Sync with 6.1.1
Merge pull request #4 from levind/work_in_progress

Work in progress