A little more refactoring.  Still more togo.

Also, the performance of mysql on my MBA is 20x slower than
on AWS (for GPS lat-lon queries).  It's still <20ms

Redis appears to be quite a bit slower as well. Will test
on AWS machine soon.