Fixed the things that needed fixing
Merge branch 'master' of https://github.com/brmahar/TSPCalendar