Merge of NAO and dNethack

Left out a bunch of files... <.<