Better Org Sync

This syncs some extra info for orgs which will be handy for some UI and email changes going forward.