JBanton, could you please hold on on adding the content from your wiki. The import process seems to have add an assortment of pages from both wikis, some being the exact same articles, just under different titles. Also, everything isn't sorted out right now. Like Raylan13 said, we are not adding any one thing from a certain wiki. We've yet to discuss how the article layout and so on will be done. With you adding the content from your wiki, and some one else possibly adding content from the other wiki will just cause a mess.
We should just hold on until the entire process is done and the two sites are merged into this one.