Add config customisations
run_or_raise -> raise_or_run
Merge branch 'config' into tlvince

Conflicts:
	config.def.h