text fixes, and entity finder refactor swc-458
Merge pull request #218 from dburdick/develop

test fixes, and entity finder refactor swc-458