WIP: BibIndex: improvements for master

Shouldn't http://en.wikipedia.org/wiki/ISO_3166-1 be good enough?