Monstrous commit so that the query system plays nicely with the map system.
Merge branch 'master' of github.com:jbowens/food-truck-magic