Category/article format update

Implemented new way to organize matched articles and categories.

Designed and implemented a new way to organize matched articles and categories. In the old method, if we had a category that also deserved an article describing it, for instance the continent of Meridan, we would have a location article "Meridan" in the category "Meridan" along with all of Meridan's sublocations. This was messy.   In the new version, we put the Meridan article in the same category that contains the Meridan category and set it so it doesn't show up in the table of contents. Then we set the Meridan category to link directly to the Meridan article if someone tries to view the category directly. As long as article parentage has been set up properly, navigation is still easy and the table of contents is clean.