Fixed bug with promises on startup. Fixes #2756.

This bug would cause your app to break if you refreshed
the page on a route the returned a promise in `model`.
Merge pull request #2759 from machty/promise-startup-fix

Fixed bug with promises on startup. Fixes #2756.