move canonical calculation into setup from title meta area, as we need it for social
Merge branch 'develop' into gh-pages