Merge new_nemelex into pot_grog_ds
Conflicts:
	crawl-ref/source/dat/descript/gods.txt
	crawl-ref/source/enum.h
	crawl-ref/source/hiscores.cc
	crawl-ref/source/output.cc
	crawl-ref/source/player.cc
	crawl-ref/source/status.cc
	crawl-ref/source/wiz-you.cc
add a comma.... again