Subtree merge in Git-Tfs wiki repo

Resolves #383