Shuffle methods take 2, much cleaner
Merge pull request #8 from centro/shuffle_take2

Shuffle methods take 2, much cleaner