Simplified Random Forest

Simplified random forest code for general CV splits.  Not likely to
affect results otherwise, just code housekeeping.