Initial fix for the AM/PM time thingy.  Still a WIP
Changed times to use am/pm.  Fixes #11
Merge remote-tracking branch 'upstream/master'
Merge pull request #61 from bstascavage/master

Changed times to use am/pm. Fixes #11