Started conversion to UUID's for upcoming bukkit change
Fixes for BattleTracker