permalink tweaks

removed categories
Merge branch 'master' into gh-pages