The SQL for the Sub Alarms was not returning Sub Alarms with no dimensions. Added an outer join
Modified the AlarmRepositoryImplTest to test getting sub alarms without dimensions in the Metric as well as ones with dimensions
merged craig's changes
merged craig's changes
Merge branch 'master' of github.com:hpcloud-mon/mon-api

Merge the changes for handling expressions with no dimensions when fetching SubAlarms