Cleanup data load stuff.
Merge branch 'master' of https://github.com/Bwian/pops