Fix the issue that config in site.yml won't override default ones.

#958 creates a new layout, however `site.yml` and `deploy.yml` won't override default options. Here is a patch to fix it.

@parkr do you agree?