This patch also deletes all of the compatibility code that we no longer need.
This patch also makes the '-d' argument optional, with the base directory defaulting to the directory of the configuration file.