Change permalink style to omit date
Merge branch 'master' into gh-pages