Recalc Timing

Need to match new discard/redeck animation times (1.5 sec, +0.1)
Merge branch 'master' into gh-pages