make conceptnet assertions work
Merge remote-tracking branch 'refs/remotes/origin/refactor' into refactor