Minor modifications to date matching code to calculate 'today' and 'this week' from midnight rather than now.  Fixes #85.