WIP merge locators locations

@cpennington @flowerhack - this is still failing a number of tests. I am working on this now.
Some discussion has lead to the conclusion that objects shouldn't compare differently based on their deprecated status.