WIP merge locators locations

@cpennington @flowerhack - this is still failing a number of tests. I am working on this now.
This should probably have `deprecated=True` (and the test should fail right now, given that it doesn't).