Switch to using @ to separate key/value pairs in serialized locators
Switch to consistent prefixes between locators
Merge pull request #28 from cpennington/key-value-serialized-form

Clean up locator serialized forms