Tidy up the config file template

Including removing commented-out settings