Merge branch 'hotfix/zinnia-comments'
Add appropriate rel links in header to deal with the duplicate content issue, at least for CMS pages
Opportunistic optimisation:  remove memory-intensive and obsolete search-related code from context processor
Switch to our zinnia fork to get a full author list in zinnia admin untill patch is accepted upstream
Merge branch 'hotfix/blog_authors' into develop