data massaging
Merge branch 'master' of https://github.com/socho/edx