Turn Locations into dicts less often
Merge pull request #1061 from cpennington/faster-location-urls

Turn Locations into dicts less often