Added catacomb map credit to BMWxi
New Makefile.
New SIMBA.
Fix up Makefile.
Merge remote-tracking branch 'upstream/master'