Country code tweaks

Add a --alpha3 option, and include WLD for the whole World, in line
with World Bank practice.