Strip out dates for today and tomorrow Fixes #18