More fixes for BaseMap router.

Also upgraded stubmodule to fix failing tests.
Merge pull request #61 from agrc/fixes

More fixes for BaseMap router.