Fixing the appengine routing
Merge changes from Brian.