Update discrimination.regex file location?

When a configuration file is read and the conf_dir is changed, currently the location of the discrimination.regex is not updated. As all the other files locations are updated this seems like an oversight and this patch makes the behaviour consistent.

Apologies for the formatting changes, but they seemed in keeping with the code style.