New-style shuffles

This renames shuffle to swizzle and replaces shuffleMix with a fully-general shuffle, implementing the proposal in issue #74.