Merge pull request #296 from edx-solutions/mattdrayer/api-org-migration

mattdrayer/api-org-migration: Moved api_manager data migration work to o...
ziafazal/api-fix-company-proficiency-avg: fix for

incorrect average calculation
Merge pull request #298 from edx-solutions/ziafazal/api-fix-company-proficiency-avg

ziafazal/api-fix-company-proficiency-avg: fix for incorrect average calculation