Rewrote logger as a decroator
Added logging to alarm test
Merge branch 'master' into logging