I thought we were going with including it as a parameter? If so, this file and all the YAML files should be deleted.  If not, we should talk; you should only set default URL options in a certain context (e.g. mailer), not globally.