short cut return
tidy
Merge branch 'master' into feature/aggregation-types
break out per-org aggregations
fix syntax error
duplicate functions for per-org aggregations
Merge branch 'feature/aggregation-types'
fix import thinko
disable aggregation type for all data
fix underscores in longopt
fix handler invocation
fix import
start to remove abuse of return types in test lookups
remove uncalled branch
continue to remove abuse of return types in test lookups
Merge remote-tracking branch 'origin/feature/ui'
Merge branch 'master' into feature/aggregation-types
break up long line
work around changed interface
restore global aggtype