Code cleanup
Merge branch 'master' of https://github.com/nppangband/NPPAngband_QT into diego
Fixed bug
Targetting code
Merge branch 'diego' of https://github.com/nppangband/NPPAngband_QT.git into Jeff

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