use date instead of time if not within the day
make slight modifications to the display of time
Merge branch 'master' of https://github.com/jtwarren/mit_fixit