Fix config.php yet again

We want to be able to override all of the CFG variables, including the
URL
Merge remote branch 'upstream/master'