Fix DateTime 24 hour to 12 hour conversion

Prior implementation was breaking when hours were 0 or 12.
Fix AM/PM selection at noon