Merge pull request #17 from elemoine/alarms

Be consistent in the way alarm clusters are defined