state.py: bring back the --shuffle option.
state.py: bring back the --shuffle option.

I deleted that one for a good reason - the code for it was in a weird place.
Now it's in a different weird place, but it's back.

pombredanne/redo,pombredanne/redo,pombredanne/redo,pombredanne/redo