Update and rename 2012-07-15-discipline-in-a-long-distance-race.md to 2012-07-15-sermon.md

Standardise tags.