Updated data with clean country names, fixes #4, fixes #11