fixed up data loader (i think)
Merge branch 'dockerize'