WIP merge locators locations

@cpennington @flowerhack - this is still failing a number of tests. I am working on this now.
Munging the `groups` dict like this is a bit confusing. I'd probably lean towards passing the values directly (pulling the ones from `groups` directly that you still need.