Consolidation and removal of BeastMasteryShortCooldownActions() and SurvivalShortCooldownActions() functions

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.

This may be a personal preference but in practice the extra icon for only the shortCDs seemed unnecessary as well as Barrage missing from the AOE function