Updated wikimap for consistency with June Wikipedia dump; also
added more mappings.