Addressed data migration issues
Merge pull request #273 from edx-solutions/mattdrayer/data-conversion-update

Addressed data migration issues