update guava, java-util, and druid-api
Merge branch 'master' of github.com:metamx/druid into new-guava
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 branch 'master' into new-guava

Conflicts:
	server/src/main/java/io/druid/server/QueryResource.java
address code review
Merge branch 'master' of github.com:metamx/druid into new-guava
fix bad merge
Merge branch 'master' into new-guava