Since we have to include `global_deploy.conf` in every project now, I don't see any advantage to break the config into two files, and just put everything in deploy.conf so there's only one config file to deal with.  But I don't care all that much.