unhardwire
clean up filename generation
rm debug line
Merge branch '227-sampling' of ssh://github/pwyf/IATI-Data-Quality into 227-sampling
remove largely unused lines
reorg code