Pulling in some stuff Eric helped me with, and adding tests for more hand permutations