check for the calendar_id if the shortname is not found

Some legacy URLs will use the calendar_id
fixes #127
Merge remote-tracking branch 'upstream/seven-year-itch' into issue-127
Whitespace
Merge pull request #128 from mfairchild365/issue-127

Fix legacy calendar URLs defined by the `calendar_id`