Merge pull request #63 from matthewleon/master

scrapers for London, ON and Waterloo, ON
use hotfix branch for pupa
updates for new ocd-division-ids files
upstream changes merged in