Now inserts local content correctly to the topic tree
Merge branch 'local_content_tools' of github.com:dylanjbarth/phase-2 into local_content_tools