fix post aggs with group by in #472
remove commented out code
cleaner way of implementing things
fix bugs wtih js and card aggs
make having and limitspec work for nested queries
add dimension/column selector to incremental index
add some failing tests for groupBy
Merge branch 'master' into fix-groupyb
Merge branch 'master' into fix-groupyb

Conflicts:
	processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryEngine.java
rename method
complexmetricserde workaround for groupby
fix cardinality combining factory
js/cardinality/hyperUnique happy groupBy family
Merge pull request #593 from metamx/fix-groupyb

Support all standard Druid functions in GroupBy and nested groupBy