Update models
Implement freebase entity resolution
Fix bugs in freebase module and add basic tests; still needs more assertions
Merge branch 'freebase'