[rackspace|monitoring] replaced entity_id and check_id attributes with entity and check attributes; removed entity_id from base module.
Merge pull request #2054 from rackspace/alarm_fix

[rackspace|monitoring] Refactored alarm class