Fixes to scramble generation algorithm

- The randomFace method now takes two parameters
- Does not allow moves that were the same as the last, or on the same axis as the last three