More Cleanup
Moving face color rotations into the cubie model