Added support for a new config option, "includename". This value defaults