Closes #154.
incorporated changes from Jay Jacobs.
more changes from Jacobs.
Merge pull request #160 from vz-risk/SIRA_Incident

Closes #154.