Make installable with DataModel 2.x
Merge pull request #123 from wmde/dm2

Make installable with DataModel 2.x