Merge remote-tracking branch 'upstream/master'
server changes to robustness. updates to generating new training set data
update prior to merge
after merge
invfold updates to be more general to wrk on newer training sets
completed merge.