Add more group bys with button
Remove buttons on aggregate fields
feature-dynamic-aggregate-field merged into master; resolves #1