Removed BeastMaster & Survival ShortCooldowns() functions by rolling the abilities, where necessary, into the main rotation functions as well as adding Barrage to the AOE functions.  Also added HuntersMark() to the main cooldowns functions