Tidy it up and make it resilient of missing options
Tidy it up and make it resilient of missing options

alphagov/govuk-puppet,alphagov/govuk-puppet,alphagov/govuk-puppet,alphagov/govuk-puppet,alphagov/govuk-puppet,alphagov/govuk-puppet