Merge of Thurion, Za'lek and Heretics, plus minor updates and fixes.

Most things have been tested. I sadly can’t work on it anymore as Naev eats too much memory (or my memory isn’t correctly managed, or whatever) and gets randomly OOM’ed.