Updated default shuffling behavior for training and cross-validation

This pull request implements the solution proposed in #189