Alarm

Updates master include latest alarm functionality. Still needs to reset pre-sleep on a daily basis.