Replace shuffle algorithm for WeightedShuffle()
#80

an63 wants to merge fixrand into master

We do not currently have an analysis of these two commits