Fix NOCOLOR and include new location of make.conf