Tweaks: ignore calendars that aren't visible, add a 'CurrentAndNext' mode.
Merge remote-tracking branch 'eviljim/master'