Remove model property from context and query

This will require a subsequent change in Serrano

Signed-off-by: Don Naegely <naegelyd@gmail.com>
Merge pull request #247 from cbmi/remove-model-property

Remove model property from context and query