Cleanup, bugfix

Made sure there are set dungeon times before trying to set alarms for
them.
Merge remote-tracking branch 'origin/master'