Fixing arg indices for cli wrapper
Merge branch 'master' of https://github.com/UW-ICTD/ODKScan-core