fix underscore
tidy up option handling
merge option lists
Merge branch 'master' of ssh://github.com/markbrough/IATI-Data-Quality