Modified shuffle function to mix tracks from both before and after the current song.
Merge remote-tracking branch 'origin/master'