Remove some deprecated and unneeded stuff
Fix aggregateBy tuning
Fixes #358
Merge pull request #518 from twitter/thenFix

Fixes #358
Merge pull request #517 from twitter/fix-spillthresh-tuning

Fix aggregateBy tuning
Merge pull request #515 from twitter/deprecated-clean

Remove some deprecated and unneeded stuff