Remove tree and count fields from Context and Query models

Signed-off-by: Don Naegely <naegelyd@gmail.com>
Add count methods to context and query

This includes tests for these methods.

Signed-off-by: Don Naegely <naegelyd@gmail.com>
Merge pull request #245 from cbmi/issue-194

Remove tree/count fields from Context and Query models