Update ConceptNet loader code
Merge branch '2.0-dev'

* 2.0-dev:
  Update ConceptNet loader code