Rename "query" to "conditions."  Add populate query option.  Debugging
Merge branch 'master' of github.com:wprl/baucis