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 branch 'master' into feature/aggregation-types
break up long line
work around changed interface
restore global aggtype
Update template, change p_group to organisation
apply aggregation types
Add aggregation_type option to organisations views
Merge branch 'feature/ui'