WIP merge locators locations

@cpennington @flowerhack - this is still failing a number of tests. I am working on this now.
Hm.  Is this something we're still deciding?  Or can we consider the decision made with this PR?