Add new reshuffler
Add deterministic version of the new reshuffler
Merge branch 'master2' into reshuffle2
Reshuffle defaults to stable reshuffle