Changed reroll behaviour so that dice only reroll once per turn

Fixes #1310. Fixes #1328.

http://jenkins.buttonweavers.com:8080/job/buttonmen-blackshadowshade/443/