Merge pull request #232 from brente/ago-naturaltime

Use naturaltime for elapsed times
Merge branch 'master' into template-cleanup