Merge pull request #32 from tballast/master

Removed redundant functions from DetectionSystemGriffin
First commit with changes based on new structure. Not Operational.