Added another potential scoring scenario.
Fixed some scoring bugs involving sets

Fixed a bug that would incorrectly cause a player to farkle
if he selected a set of dice as well as some extra 1's or 5's

In addition, players can now keep two separate three of a
kind sets, and receive the appropriate score.