WIP merge locators locations

@cpennington @flowerhack - this is still failing a number of tests. I am working on this now.
Oops. This won't work. I'll fix it now (and add a test).