Fixed a bunch of map routing code.
Merge branch 'master' of github.com:gitoffourlawn/daemondash