Changes to allow generation of Turker location maps.
Fixed merge conflicts.