Saner config management

Providing a lump of default config.yml files is nice, but it means each time we add/modify something we need to make the change in multiple places.

We should investigate to see if we can have a global inherited config.yml file with ability to only locally override the changes (i.e in the vm/aws/aws-jenkins config files)
