Add world capitals to city list

I pulled a list of world capitals from Wikipedia, added it to the cities list, and rebuilt the city data.
`bin/rebuild-city-data` required a bit of editing to handle non-ascii characters.

Also ran a PEP8 autoformatter on the main codebase