Modified the battle queue so that it works as it should with cooldowns actually being used. Untracked a bunch of stuff we don't need.
Added some stuff back in that I probably should have left tracked by git.