Add back geographic-regions and fix a few bugs.
Merge remote-tracking branch 'origin/gh-pages'