Changed MacroTurn so that timeout can be specified on a per-macro basis
Changed MacroTurn so that timeout can be specified on a per-macro basis

Signed-off-by: Andrew Duffy <37d91e36503b56d443e3222a115eefdacaca6d38@gmail.com>

grt192/2013ultimate-ascent,grt192/2013ultimate-ascent