Nicer badges
Merge pull request #178 from pikesley/nicer-badges

Nicer badges
organisation: call Taiwan 'Taiwan' not 'Taiwan (Province of China)'

This is done via an override in foundation/settings.py because of
how django_countries is customised.