#1536 Update canonical capture in head.html to support override

[druttka]

I just added an if to the existing capture such that if the user has explicitly specified a canonical location, it uses that instead. Worked for my use case, but of course when I change themes I have to reapply it. Still new to Octopress, so not sure if there's a better place to make this kind of change?