Cleaned up config.mk.
Changes to the way template objects are compared.