Move over new Term classes to DataModel
Merge pull request #25 from wmde/move

Move over new Term classes to DataModel