Fix for 12am and 12pm.

12am should be hour 0, 12pm should be hour 12.
Merge remote-tracking branch 'choptastic/12am-12pm-fix'