switch to new Alarm implementation; refactoring
Merge branch 'master' of github.com:SWilke/Catnapper