Probably about to break dNAO again...

Merge of the lastest dnethack changes with dNAO.

The version prior to this commit complied.... I'm guessing the version after this commit wont :).
Merge branch 'master' of https://github.com/Chris-plus-alphanumericgibberish/dNAO.git