fused agents and orgs
Merge branch 'master' of https://github.com/countpauper/countpauper
stash