Merge pull request #19 from alphagov/template-fixes

Template fixes