add Waterloo, ON
fix conform keys
Merge pull request #154 from ansis/ca-on-waterloo

add Waterloo, ON