Geolocation temp

review? @mykmelez

This may not apply cleanly due to all the merge commits, but if not it's really just the last commit that is important and can be cleanly applied or manually fudged to work.  The important thing is to start the review process.