! part II of consolidating the config vars

Signed-off-by: Spuds <spuds@spudsdesign.com>
! and some cleanup

Signed-off-by: Spuds <spuds@spudsdesign.com>