Seems like this would be easier for organization of the sidebar.

• Reformat _config.yml to use new data structure
• Add countries to existing cities
• Nest cities into countries in _layouts/default.html
• Change generator in Rakefile for cities to include country on input and on output into _config.yml