Fixing transaction type descriptions
Merge branch 'master' into agg_fix
Winning version of tmp_assoc_indiv_id query (in concert with Postgresql settings adjustments) that finished in 4 minutes instead of being stuck for 24+ hours
Merge branch 'master' into partitioning
Merge branch 'partitioning' into agg_fix