second attempt, pretty permalinks
Merge branch 'master' into gh-pages

test merge