Correctly pass `$options` to parent when constructing
Re-order routes so that a calendar is not always matched

`upcoming`, `fullcal` etc were being matched as a calendar shortname.  So re-order the rules to prevent this.
Render any exception though the exception template
Merge remote-tracking branch 'upstream/seven-year-itch' into issue-31
Merge pull request #34 from mfairchild365/issue-31

Get the upcoming view working