Merge pull request #24 from rbart/rerank

Encapsulate query logic, factor out org/person specific code, use KBPQuery objects for input
Merge branch 'master' into rerank