Tidy up XML markup.
Merge branch 'master' of https://github.com/neelsmith/chronicles