new service call for performance testing of graph rendering
Merge branch 'master' of https://github.com/ooici/ion-definitions
Merge branch 'master' into remove_comms_event
site_status computed attribute
Merge pull request #253 from ifreecarve/2012-12-21_site_status

site_status computed attribute
Added alarm events.
alarms to key off stream_name rather than stream_id
Add alarm ion objects.
Fixed name typo in alarm name. Fixed alarmdef default values.
Merge branch 'master' into remove_comms_event