Makefile aesthetics
Merge remote-tracking branch 'origin/master' into p2

Fixed conflicts:
	Makefile
p2: revert parts of 57541ba9, ptr is volatile, and needs to be on the stack of potion_source_load()

This fixes the loading of .pnb
use -g3 for gcc DEBUG, clang not
p2: comments only
Merge remote-tracking branch 'origin/master' into p2