tweak permalinks
Merge branch 'master' into gh-pages

* master:
  tweak permalinks
update CNAME