Change the code so that if there is a non-blank wiki page, it OVERRIDES the defaults rather than adding to the defaults.

This keeps the feature intact in case we want to support wiki agnostic. And also solves the problem of the two code spots (repo and on-wiki) diverging in the future if both are in use.