Remove _old
Add canonical
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

* upstream/gh-pages:
  Add canonical
Remove slash