Refactor templates
Display relative times
Merge branch 'master' into gh-pages