Separate out locations
Format
Cleanup data file
Merge pull request #63 from jayfo/calendar

Calendar