Parse locator url better

Move all parsing to one url and use it wherever it's needed. Try to clean up some confusing code paths. Also, don't allow init'g new Locator using an old Locator w/ version and an override version spec (too confusing).

@cahrens @singingwolfboy please review