I spotted this after the merge -- as it turns out alter_alarm_state returns a pair, not a singular value.  We'd find it eventually; might as well fix it now.
Merge branch 'master' into alter-alarm-state-altered
Merge pull request #8 from rackerlabs/alter-alarm-state-altered

alter_alarm_state returns a pair of values, not a single value
Merge from trunk