Split the query count into distinct_count and record_count

See https://github.com/cbmi/avocado/issues/129 for more info on the
source of this change.