Add Swiss Confederation and Cantons

Note: The second commit (bae21fd) is not related to this pull request. Let me know if you prefer that I remove it.