another weird workaround for routing bugs
users now linked in history
finishes blocking out request
Merge branch 'master' into gh-pages