Add parsing of aggregate functions and a group by clause
Clean up tokenizations generated by parser