jed/9-my-locations

Keeping master in sync with My Location updates. WIP.