Simplify merging of secret.ini and make it optional.