Feature/expand data arg

Expand data argument for future options, per @syclik's request.

@syclik or @bob-carpenter, can one of you verify that test unit and test models pass locally before risking a Jenkins test?  I did some spot checks (and can't find any stale code using grep) but I can't run the full tests on my machine (not enough RAM) and I'd rather not waste a day of Jenkins time on a mistake on my part.