Fix getClientCountryChoices in generate.py. Now works with new client.csv format instead of the deprecated direct-users.csv
Merge pull request #1 from Wegi/master

Fix generate.py to work with new client.csv

closes shadow/shadow#213