Removed site.url override
Replaced site.url with site.canonical
Merge pull request #17 from gbonfant/master

Replace site.url with site.canonical