Fix minor bugs found during demo
Merge branch 'master' of https://github.com/jebaum/calendar