We need to add group.sort for VIT-2182. 

I've changed the way groupbys work in Charizrd.  Giving the models more control over the group fields