DRY up Circle CI config generated by generate-circleci-config.py

[simonsdave]

Should be able to DRY up the CircleCI config generated by generate-circleci-config.py. This has some good thought starters on the topic.