Change "savage_roar" to "savage_roar_buff" when checking for the buff and
fix a misused BuffExpires.  Fixes from @aggixx.