GCD changes

Handle tracking the GCD in a better fashion and simplify checking spell CD