Fix track id returned in shuffle
Merge branch 'master' of github.com:ceigel/augmented_shuffle