Add more countries and remove a duplicate

For: https://www.pivotaltracker.com/story/show/46385609

In for review because the 2nd data migration removes a duplicate world location and tries to reassign any other data tagged to it over to the version we are keeping.  I want a 2nd set of eyes to think about anything I've missed.