Add test case for aggregate.sort
Merge branch 'feature_query_rewrite' into feature_query_rewrite_datatable

(annoyingly, 'unsorted' cell order is different in rewrite, but that shouldn't matter)

Conflicts:
	amcat/tools/tests/aggregate.py