misc fixes to zl_gfx and a few mis-merged preprocessor defs
removed some cruft merge files from the big rebase...