change rel="canonical" on dev site to point to live site
fix a few errors in rel="canonical" code
Merge branch 'refs/heads/bugfix'