Small optimizations to country-related lookups.

This is a technically a backwards incompatible change to the
undocumented api, since countries.countries now returns a dict rather
than a list.

Made in response to a comment in #41.