Merge pull request #1 from jpmckinney/master

Tidy syntax
minor syntax changes
conflicts resolved
row indexes changed to correctly parse government site
more rigorous wiki parsing
more rigorous gc.ca
put icurr in same format