Sort states by display name

Also moves the U.S. Armed Forces postal codes (AA, AE) over from the Canadian
states list.