Location to/from locator mapping facilities

was pr 601 but I accidentally blew it away when I rebased --onto master w/ push -f afterward
@cpennington