Fix unhandled routes not resulting in a server round-trip.
Merge remote-tracking branch 'upstream/master' into fix/unhandled

Conflicts:
	index.js
	page.js
Merge pull request #123 from andyburke/fix/unhandled

Fix unhandled routes not resulting in a server round-trip.