martin's changes on this branch
small changes by me. push back
added the S/N calculations
changed OBs
Merge pull request #1 from wkerzendorf/martins_changes

Martins changes