Fix problem with datetime.today.

I always assumed datetime.today returned <today> 00:00 as the time.  How
fucking stupid am I.  This patch adds a check for next_rise.hour > 0
too.
Merge the fix for stupid use of datetime.today().