changes for new configs#11

matthew-elsham wants to merge 2 commits intoelliot-certoctoenergy/octo_jaffle_shop:elliot-certfrom

matthew-certoctoenergy/octo_jaffle_shop:matthew-certCopy head branch name to clipboard