WIP merge locators locations

@cpennington @flowerhack - this is still failing a number of tests. I am working on this now.
Same question as before. Should this commented code be here? `# loc = BlockUsageLocator('org', 'course', 'run', 'cat', 'name:more_name', 'rev', deprecated=True)`