Folded makefile.conf bits into the makefile