Combined Dice and DiceParser.

Wow, I wrote this a while ago and I'm not sure why these classes were
separate.  Well, now it's down to Java files and the Dice class contains
the formula parsing method.