WIP merge locators locations

@cpennington @flowerhack - this is still failing a number of tests. I am working on this now.
That todo is older than the hills, in edX time.