Fix Irrlicht includes in scriptapi_*
Change libjson to libjsoncpp in .gitignore
Re-add dungeons in new dungeongen.cpp
Merge 'upstream/master' into minemovie