Shuffle the training and test images

[DavidZong]

The test set is just the first 30% of the whole set, but that makes some of the test images highly correlated. Best to shuffle them into the training set and re-slice.