yanking routing for non-pushstate clients
fix conflict
Merge pull request #324 from theresaanna/master

Forking app flow to shove router calls in a ditch if the client doesn't support pushState