Tidying up the config

And also using a more sensible default
Filling out the templates with the simplified format
Dockerfiles should not be executable