more rigorous wiki parsing
more rigorous gc.ca
put icurr in same format
Merge pull request #2 from jpmckinney/master

Enrich data model