Merge pull request #1355 from cisagov/za/1243-import-org-data

Merge pull request #1355 from cisagov/za/1243-import-org-data #38