Added option for 24hour clock, added 'AM'/'PM' to 12hr clock (Issue#34)