Fixed somethings.
Merge branch 'master' of https://github.com/blakebuck/ourcalendar