Requested changes

Handled broken dice in recipe better, merged arrays of skills/die types
correctly, updated qunit tests.