fixed display of 12pm
version bump
Merge pull request #1 from nightscout/master

Updating my master branch