updates to loader for ICP 2d data, to handle new MAGIK detector
Merge branch 'master' of github.com:scattering/dataflow